From 87e6e64f99de751c4459eb7acc6ac31e20db1f25 Mon Sep 17 00:00:00 2001 From: Drew Adams Date: Wed, 13 Jun 2012 08:36:29 -0400 Subject: [PATCH] * lisp/help-mode.el (help-bookmark-make-record, help-bookmark-jump): Fix last change. --- lisp/ChangeLog | 51 ++++++++++++++++++++++++++--------------------- lisp/help-mode.el | 11 +++++----- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1e3908d487a..4e52a213eab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-06-13 Drew Adams + + * help-mode.el (help-bookmark-make-record, help-bookmark-jump): + Fix last change. + 2012-06-13 Michael Albinus * net/dbus.el (dbus-call-method): Use timeout for `read-event'. @@ -134,13 +139,13 @@ gid as real numbers. They could run out of integer range on cygwin. (tramp-do-copy-or-rename-file-out-of-band): Better trace format. (tramp-sh-handle-expand-file-name): Handle hops. - (tramp-open-connection-setup-interactive-shell): Use - `tramp-cleanup'. Move check for busyboxes ... - (tramp-find-shell): ... here. Simplify implementation. Set - "remote-shell" property also for alternative shells. - (tramp-remote-coding-commands): Check "test -c /dev/stdout". If - failing, a regular file would be written otherwise. Reported by - Dmitry Kurochkin . + (tramp-open-connection-setup-interactive-shell): + Use `tramp-cleanup'. Move check for busyboxes ... + (tramp-find-shell): ... here. Simplify implementation. + Set "remote-shell" property also for alternative shells. + (tramp-remote-coding-commands): Check "test -c /dev/stdout". + If failing, a regular file would be written otherwise. + Reported by Dmitry Kurochkin . (tramp-find-inline-encoding): Cache the coding commands in the process cache. Apply test command on the remote side, if defined. (tramp-find-inline-compress): Cache the compress commands in the @@ -148,15 +153,15 @@ (tramp-compute-multi-hops): Save `tramp-default-proxies-alist' when requested. Handle hops. (tramp-current-connection): New defvar. - (tramp-maybe-open-connection): Use `tramp-cleanup'. Throw - `suppress', if there was a failed connection shortly before. + (tramp-maybe-open-connection): Use `tramp-cleanup'. + Throw `suppress', if there was a failed connection shortly before. Handle user interrupt. (Bug#10187) - (tramp-get-inline-compress, tramp-get-inline-coding): Read - connection properties from the process cache. + (tramp-get-inline-compress, tramp-get-inline-coding): + Read connection properties from the process cache. * net/tramp-smb.el (tramp-smb-server-version) - (tramp-smb-wrong-passwd-regexp, tramp-smb-actions-with-tar): New - defconsts. + (tramp-smb-wrong-passwd-regexp, tramp-smb-actions-with-tar): + New defconsts. (tramp-smb-prompt): Extend for powershell prompt. (tramp-smb-file-name-handler-alist): Add handlers for `process-file', `shell-command' and `start-file-process'. @@ -170,17 +175,17 @@ Implement using "tar". By this, time-stamps are preserved. (tramp-smb-handle-copy-file): Handle also the case of directories. (tramp-smb-do-file-attributes-with-stat) - (tramp-smb-get-file-entries, tramp-smb-get-cifs-capabilities): Use - `tramp-get-connection-buffer'). + (tramp-smb-get-file-entries, tramp-smb-get-cifs-capabilities): + Use `tramp-get-connection-buffer'). (tramp-smb-handle-rename-file): Use "rename", when source and target are on the same share. - (tramp-smb-maybe-open-connection): Handle wrong passwords. Use - `tramp-smb-server-version'. + (tramp-smb-maybe-open-connection): Handle wrong passwords. + Use `tramp-smb-server-version'. (tramp-smb-wait-for-output): Remove prompt. * net/tramp.el (top): Require 'cl. - (tramp-methods, tramp-rsh-end-of-line): Remove - `tramp-password-end-of-line' from docstring. + (tramp-methods, tramp-rsh-end-of-line): + Remove `tramp-password-end-of-line' from docstring. (tramp-save-ad-hoc-proxies): New defcustom. (tramp-completion-function-alist): Adapt docstring. (tramp-default-password-end-of-line): Remove defcustom. @@ -200,8 +205,8 @@ `tramp-message-show-message' here, because this suppresses also error buffers. (tramp-error-with-buffer): Suppress buffer view, if - `tramp-message-show-message' is nil. Use - `tramp-get-connection-buffer'. + `tramp-message-show-message' is nil. + Use `tramp-get-connection-buffer'. (tramp-cleanup): New defun. (tramp-rfn-eshadow-update-overlay): Let-bind `non-essential' to `t'. (tramp-file-name-handler): If `debug-on-error' is set, propagate @@ -219,8 +224,8 @@ (tramp-action-password): ... here. (tramp-mode-string-to-int, tramp-local-host-p) (tramp-make-tramp-temp-file, tramp-read-passwd) - (tramp-clear-passwd, tramp-time-less-p, tramp-time-diff): Set - tramp-autoload cookie. + (tramp-clear-passwd, tramp-time-less-p, tramp-time-diff): + Set tramp-autoload cookie. * net/trampver.el: Update release number. diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 88b5e095cf6..85c1e62e2c3 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -808,9 +808,8 @@ Implements `bookmark-make-record-function' for help-mode buffers." (unless (car help-xref-stack-item) (error "Cannot create bookmark - help command not known")) `(,@(bookmark-make-record-default 'NO-FILE 'NO-CONTEXT) - (buffer-name . "*Help*") (help-fn . ,(car help-xref-stack-item)) - (help-arg . ,(cadr help-xref-stack-item)) + (help-args . ,(cdr help-xref-stack-item)) (position . ,(point)) (handler . help-bookmark-jump))) @@ -819,10 +818,10 @@ Implements `bookmark-make-record-function' for help-mode buffers." "Jump to help-mode bookmark BOOKMARK. Handler function for record returned by `help-bookmark-make-record'. BOOKMARK is a bookmark name or a bookmark record." - (let ((help-fn (bookmark-prop-get bookmark 'help-fn)) - (help-arg (bookmark-prop-get bookmark 'help-arg)) - (position (bookmark-prop-get bookmark 'position))) - (funcall help-fn help-arg) + (let ((help-fn (bookmark-prop-get bookmark 'help-fn)) + (help-args (bookmark-prop-get bookmark 'help-args)) + (position (bookmark-prop-get bookmark 'position))) + (apply help-fn help-args) (pop-to-buffer "*Help*") (goto-char position))) -- 2.39.5