Merge from trunk.

17 files changed, 177 insertions, 82 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68b8a86a2d9..541cea5c7d4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,23 @@
+2012-10-17  Michael Heerdegen <michael_heerdegen@web.de>  (tiny change)
+
+        * wdired.el (wdired-old-marks): New variable.
+        (wdired-change-to-wdired-mode): Locally set wdired-old-marks.
+        (wdired-do-renames): Move point with renamed file and don't lose
+        mark status (Bug#11795).
+
+2012-10-16  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (query-replace-help): Mention multi-buffer replacement
+        keys in the Help message.  (Bug#12655)
+
+2012-10-15  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/byte-run.el (defsubst): Doc fix.
+
 2012-10-14  Eli Zaretskii  <eliz@gnu.org>
 
+        * window.el (display-buffer): Doc fix.
+
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
         Adjust the msft regexp to the output of Studio 2010, and move msft
         before edg-1.  See the discussion on emacs-devel,
@@ -597,9 +615,9 @@
         * emacs-lisp/eieio-base.el (eieio-persistent-read): New input args
         specifying the expected class, and whether subclassing is allowed.
         (eieio-persistent-convert-list-to-object):
-        (eieio-persistent-validate/fix-slot-value)
-        (eieio-persistent-slot-type-is-class-p): New functions.
-        (eieio-named::slot-missing): Doc fix.
+        (eieio-persistent-validate/fix-slot-value)
+        (eieio-persistent-slot-type-is-class-p): New functions.
+        (eieio-named::slot-missing): Doc fix.
 
         * emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots):
         Stop using unused publd variable.
@@ -2042,7 +2060,7 @@
 
         * ses.el (ses-widen):
         * simple.el (count-words--buffer-message):
-        * net/browse-url.el (browse-url-of-buffer): Use it
+        * net/browse-url.el (browse-url-of-buffer): Use it.
 
         * simple.el (count-words-region): Don't signal an error if there
         is a non-nil prefix arg and the mark is not set.
@@ -16324,7 +16342,7 @@
 2011-06-22  Leo Liu  <sdl.web@gmail.com>
 
         * minibuffer.el (completing-read-function)
-        (completing-read-default): Move from minibuf.c
+        (completing-read-default): Move from minibuf.c.
 
 2011-06-22  Richard Stallman  <rms@gnu.org>
 
@@ -18181,7 +18199,7 @@
         Remove unnecessary and incorrect declarations.
 
         * emacs-lisp/check-declare.el (check-declare-scan):
-        Handle byte-compile-initial-macro-environment in bytecomp.el
+        Handle byte-compile-initial-macro-environment in bytecomp.el.
 
 2011-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 14e8d6c1d64..e89e8ed258b 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,4 +1,32 @@
-2012-10-08  David Engster  <deng@randomsample.de>>
+2012-10-14  David Engster  <deng@randomsample.de>
+
+        * semantic.el (semantic-error-if-unparsed): New function.  Raise
+        error if buffer was not parsed by Semantic (bug #12045).
+        (navigate-menu, edit-menu, cedet-menu-map): Enable Semantic items
+        only if buffer was parsed.  Also, replace ':active' with ':enable'
+        where necessary.
+
+        * semantic/wisent/python.el
+        (semantic-python-get-system-include-path): Use
+        `python-shell-internal-send-string' if available to query Python
+        for system paths.
+
+        * semantic/senator.el (senator-next-tag, senator-previous-tag)
+        (senator-go-to-up-reference): Use `semantic-error-if-unparsed'.
+
+        * semantic/complete.el (semantic-complete-jump-local)
+        (semantic-complete-jump, semantic-complete-jump-local-members)
+        (semantic-complete-self-insert): Use `semantic-error-if-unparsed'.
+        (semantic-complete-inline-project): Fix autoload cookie.
+
+        * semantic/analyze/complete.el
+        (semantic-analyze-possible-completions): Check if buffer was
+        parsed.  Only raise an error if function was called interactively,
+        otherwise silently return nil.
+
+        * cedet.el (cedet-menu-map): Fix copy&paste typo in menu creation.
+
+2012-10-08  David Engster  <deng@randomsample.de>
 
         * semantic/bovine/el.el: Add `semantic-default-elisp-setup' to
         `emacs-lisp-mode-hook'.  This was accidentally removed during the
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index 5c21e4ab538..327a72f9dc7 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -59,7 +59,7 @@
     (define-key map [navigate-menu]              'undefined)
     (define-key map [semantic-options-separator] 'undefined)
     (define-key map [global-semantic-highlight-func-mode]   'undefined)
-    (define-key map [global-semantic-highlight-func-mode]   'undefined)
+    (define-key map [global-semantic-stickyfunc-mode]   'undefined)
     (define-key map [global-semantic-decoration-mode]       'undefined)
     (define-key map [global-semantic-idle-completions-mode] 'undefined)
     (define-key map [global-semantic-idle-summary-mode]     'undefined)
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index e02790cbfa8..373864a43d5 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -319,6 +319,11 @@ a parse of the buffer.")
   "Return non-nil if the current buffer was set up for parsing."
   semantic-new-buffer-fcn-was-run)
 
+(defsubst semantic-error-if-unparsed ()
+  "Raise an error if current buffer was not parsed by Semantic."
+  (unless semantic-new-buffer-fcn-was-run
+    (error "Buffer was not parsed by Semantic.")))
+
 (defsubst semantic--umatched-syntax-needs-refresh-p  ()
   "Return non-nil if the unmatched syntax cache needs a refresh.
 That is, if it is dirty or if the current parse tree isn't up to date."
@@ -907,75 +912,91 @@ Throw away all the old tags, and recreate the tag database."
   ;; Edit Tags submenu:
   (define-key edit-menu [semantic-analyze-possible-completions]
     '(menu-item "List Completions" semantic-analyze-possible-completions
+                :enable (semantic-active-p)
                 :help "Display a list of completions for the tag at point"))
   (define-key edit-menu [semantic-complete-analyze-inline]
     '(menu-item "Complete Tag Inline" semantic-complete-analyze-inline
+                :enable (semantic-active-p)
                 :help "Display inline completion for the tag at point"))
   (define-key edit-menu [semantic-completion-separator]
     '("--"))
   (define-key edit-menu [senator-transpose-tags-down]
     '(menu-item "Transpose Tags Down" senator-transpose-tags-down
-                :active (semantic-current-tag)
+                :enable (and (semantic-active-p)
+                             (semantic-current-tag))
                 :help "Transpose the current tag and the next tag"))
   (define-key edit-menu [senator-transpose-tags-up]
     '(menu-item "Transpose Tags Up" senator-transpose-tags-up
-                :active (semantic-current-tag)
+                :enable (and (semantic-active-p)
+                             (semantic-current-tag))
                 :help "Transpose the current tag and the previous tag"))
   (define-key edit-menu [semantic-edit-separator]
     '("--"))
   (define-key edit-menu [senator-yank-tag]
     '(menu-item "Yank Tag" senator-yank-tag
-                :active (not (ring-empty-p senator-tag-ring))
+                :enable (not (ring-empty-p senator-tag-ring))
                 :help "Yank the head of the tag ring into the buffer"))
   (define-key edit-menu [senator-copy-tag-to-register]
     '(menu-item "Copy Tag To Register" senator-copy-tag-to-register
-                :active (semantic-current-tag)
+                :enable (and (semantic-active-p)
+                             (semantic-current-tag))
                 :help "Yank the head of the tag ring into the buffer"))
   (define-key edit-menu [senator-copy-tag]
     '(menu-item "Copy Tag" senator-copy-tag
-                :active (semantic-current-tag)
+                :enable (and (semantic-active-p)
+                             (semantic-current-tag))
                 :help "Copy the current tag to the tag ring"))
   (define-key edit-menu [senator-kill-tag]
     '(menu-item "Kill Tag" senator-kill-tag
-                :active (semantic-current-tag)
+                :enable (and (semantic-active-p)
+                             (semantic-current-tag))
                 :help "Kill the current tag, and copy it to the tag ring"))
 
   ;; Navigate Tags submenu:
   (define-key navigate-menu [senator-narrow-to-defun]
     '(menu-item "Narrow to Tag" senator-narrow-to-defun
-                :active (semantic-current-tag)
+                :enable (and (semantic-active-p)
+                             (semantic-current-tag))
                 :help "Narrow the buffer to the bounds of the current tag"))
   (define-key navigate-menu [semantic-narrow-to-defun-separator]
     '("--"))
   (define-key navigate-menu [semantic-symref-symbol]
     '(menu-item "Find Tag References..." semantic-symref-symbol
+                :enable (semantic-active-p)
                 :help "Read a tag and list the references to it"))
   (define-key navigate-menu [semantic-complete-jump]
     '(menu-item "Find Tag Globally..." semantic-complete-jump
+                :enable (semantic-active-p)
                 :help "Read a tag name and find it in the current project"))
   (define-key navigate-menu [semantic-complete-jump-local-members]
     '(menu-item "Find Local Members ..." semantic-complete-jump-local-members
+                :enable (semantic-active-p)
                 :help "Read a tag name and find a local member with that name"))
   (define-key navigate-menu [semantic-complete-jump-local]
     '(menu-item "Find Tag in This Buffer..." semantic-complete-jump-local
+                :enable (semantic-active-p)
                 :help "Read a tag name and find it in this buffer"))
   (define-key navigate-menu [semantic-navigation-separator]
     '("--"))
   (define-key navigate-menu [senator-go-to-up-reference]
     '(menu-item "Parent Tag" senator-go-to-up-reference
+                :enable (semantic-active-p)
                 :help "Navigate up one reference by tag"))
   (define-key navigate-menu [senator-next-tag]
     '(menu-item "Next Tag" senator-next-tag
+                :enable (semantic-active-p)
                 :help "Go to the next tag"))
   (define-key navigate-menu [senator-previous-tag]
     '(menu-item "Previous Tag" senator-previous-tag
+                :enable (semantic-active-p)
                 :help "Go to the previous tag"))
 
   ;; Top level menu items:
   (define-key cedet-menu-map [semantic-force-refresh]
     '(menu-item "Reparse Buffer" semantic-force-refresh
                 :help "Force a full reparse of the current buffer"
-                :visible semantic-mode))
+                :visible semantic-mode
+                :enable (semantic-active-p)))
   (define-key cedet-menu-map [semantic-edit-menu]
     `(menu-item "Edit Tags" ,edit-menu
                 :visible semantic-mode))
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index edc3cdc230c..a83f4ff0ac8 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -87,20 +87,25 @@ in a buffer."
   ;; In theory, we don't need the below since the context will
   ;; do it for us.
   ;;(semantic-refresh-tags-safe)
-  (with-syntax-table semantic-lex-syntax-table
-    (let* ((context (if (semantic-analyze-context-child-p context)
-                        context
-                      (semantic-analyze-current-context context)))
-           (ans (if (not context)
-                    (error "Nothing to complete")
-                  (:override))))
-      ;; If interactive, display them.
-      (when (called-interactively-p 'any)
-        (with-output-to-temp-buffer "*Possible Completions*"
-          (semantic-analyze-princ-sequence ans "" (current-buffer)))
-        (shrink-window-if-larger-than-buffer
-         (get-buffer-window "*Possible Completions*")))
-      ans)))
+  (if (semantic-active-p)
+    (with-syntax-table semantic-lex-syntax-table
+      (let* ((context (if (semantic-analyze-context-child-p context)
+                          context
+                        (semantic-analyze-current-context context)))
+             (ans (if (not context)
+                      (error "Nothing to complete")
+                    (:override))))
+        ;; If interactive, display them.
+        (when (called-interactively-p 'any)
+          (with-output-to-temp-buffer "*Possible Completions*"
+            (semantic-analyze-princ-sequence ans "" (current-buffer)))
+          (shrink-window-if-larger-than-buffer
+           (get-buffer-window "*Possible Completions*")))
+        ans))
+    ;; Buffer was not parsed by Semantic.
+    ;; Raise error if called interactively.
+    (when (called-interactively-p 'any)
+      (error "Buffer was not parsed by Semantic."))))
 
 (defun semantic-analyze-possible-completions-default (context &optional flags)
   "Default method for producing smart completions.
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 9c2da9faefa..59d17f2f8bb 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -2088,6 +2088,7 @@ completion works."
 (defun semantic-complete-jump-local ()
   "Jump to a local semantic symbol."
   (interactive)
+  (semantic-error-if-unparsed)
   (let ((tag (semantic-complete-read-tag-buffer-deep "Jump to symbol: ")))
     (when (semantic-tag-p tag)
       (push-mark)
@@ -2101,6 +2102,7 @@ completion works."
 (defun semantic-complete-jump ()
   "Jump to a semantic symbol."
   (interactive)
+  (semantic-error-if-unparsed)
   (let* ((tag (semantic-complete-read-tag-project "Jump to symbol: ")))
     (when (semantic-tag-p tag)
       (push-mark)
@@ -2115,6 +2117,7 @@ completion works."
 (defun semantic-complete-jump-local-members ()
   "Jump to a semantic symbol."
   (interactive)
+  (semantic-error-if-unparsed)
   (let* ((tag (semantic-complete-read-tag-local-members "Jump to symbol: ")))
     (when (semantic-tag-p tag)
       (let ((start (condition-case nil (semantic-tag-start tag)
@@ -2216,7 +2219,7 @@ use `semantic-complete-analyze-inline' to complete."
       (error nil))
     ))
 
-;;;;###autoload
+;;;###autoload
 (defun semantic-complete-inline-project ()
   "Perform inline completion for any symbol in the current project.
 `semantic-analyze-possible-completions' is used to determine the
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 64f99a8ad6f..1138c13096a 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -255,6 +255,7 @@ TEXT, BOUND, NOERROR, and COUNT arguments are interpreted."
   "Navigate to the next Semantic tag.
 Return the tag or nil if at end of buffer."
   (interactive)
+  (semantic-error-if-unparsed)
   (let ((pos (point))
         (tag (semantic-current-tag))
         where)
@@ -294,6 +295,7 @@ Return the tag or nil if at end of buffer."
   "Navigate to the previous Semantic tag.
 Return the tag or nil if at beginning of buffer."
   (interactive)
+  (semantic-error-if-unparsed)
   (let ((pos (point))
         (tag (semantic-current-tag))
         where)
@@ -519,6 +521,7 @@ If that parent which is only a reference in the function tag
 is found, we can jump to it.
 Some tags such as includes have other reference features."
   (interactive)
+  (semantic-error-if-unparsed)
   (let ((result (semantic-up-reference (or tag (semantic-current-tag)))))
     (if (not result)
         (error "No up reference found")
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index a0ea488f0fe..89c0499b7da 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -48,24 +48,15 @@
 
 (defun semantic-python-get-system-include-path ()
   "Evaluate some Python code that determines the system include path."
-  (python-proc)
-  (if python-buffer
-      (with-current-buffer python-buffer
-        (set (make-local-variable 'python-preoutput-result) nil)
-        (python-send-string
-         "import sys; print '_emacs_out ' + '\\0'.join(sys.path)")
-        (accept-process-output (python-proc) 2)
-        (if python-preoutput-result
-            (split-string python-preoutput-result "[\0\n]" t)
-          ;; Try a second, Python3k compatible shot
-          (python-send-string
-           "import sys; print('_emacs_out ' + '\\0'.join(sys.path))")
-          (accept-process-output (python-proc) 2)
-          (if python-preoutput-result
-              (split-string python-preoutput-result "[\0\n]" t)
-            (message "Timeout while querying Python for system include path.")
-            nil)))
-    (message "Python seems to be unavailable on this system.")))
+  (delq nil
+        (mapcar
+         (lambda (dir)
+           (when (file-directory-p dir)
+             dir))
+         (split-string
+          (python-shell-internal-send-string
+           "import sys;print ('\\n'.join(sys.path))")
+          "\n" t))))
 
 (defcustom-mode-local-semantic-dependency-system-include-path
   python-mode semantic-python-dependency-system-include-path
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index d740574f1e4..462b4a25154 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -232,7 +232,8 @@ The return value is undefined.
 ;;              fns)))
 
 (defmacro defsubst (name arglist &rest body)
-  "Define an inline function.  The syntax is just like that of `defun'."
+  "Define an inline function.  The syntax is just like that of `defun'.
+\(fn NAME ARGLIST &optional DOCSTRING DECL &rest BODY)"
   (declare (debug defun) (doc-string 3))
   (or (memq (get name 'byte-optimizer)
             '(nil byte-compile-inline-expand))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 8b4df6099bc..343a6655701 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * erc.el (erc-log): Make it into a defsubst.
+        (erc-with-server-buffer, define-erc-module, erc-with-buffer)
+        (erc-with-all-buffers-of-server): Use `declare'.
+        * erc-backend.el (erc-log): Adjust autoload accordingly.
+
 2012-10-07  Deniz Dogan  <deniz@dogan.se>
 
         * erc-log.el (erc-generate-log-file-name-function):
@@ -42,8 +49,8 @@
 
 2012-08-21  Julien Danjou  <julien@danjou.info>
 
-        * erc-match.el (erc-match-message): Use
-        `erc-match-exclude-server-buffer' not
+        * erc-match.el (erc-match-message):
+        Use `erc-match-exclude-server-buffer' not
         `erc-track-exclude-server-buffer'.
 
 2012-08-20  Josh Feinstein <jlf@foxtail.org>
@@ -56,8 +63,8 @@
         (erc-lurker-threshold-time): New variables.
         (erc-lurker-maybe-trim, erc-lurker-initialize, erc-lurker-cleanup)
         (erc-hide-current-message-p, erc-canonicalize-server-name)
-        (erc-lurker-update-status, erc-lurker-p): New functions.  Together
-        they maintain state about which users have spoken in the last
+        (erc-lurker-update-status, erc-lurker-p): New functions.
+        Together they maintain state about which users have spoken in the last
         erc-lurker-threshold-time, with all other users being considered
         lurkers whose messages of types in erc-lurker-hide-list will not
         be displayed by erc-display-message.
@@ -192,7 +199,7 @@
 
         * erc.el (erc-ssl): Made into a synonym for erc-tls, which
         provides a superset of the same functionality.
-        (erc-open-ssl-stream): Removed.
+        (erc-open-ssl-stream): Remove.
         (erc-open-tls-stream): Use `open-network-stream' instead of
         `open-tls-stream' directly to be able to use the built-in TLS
         support.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 20ccd071b95..b8b5c90b596 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -100,7 +100,7 @@
 (require 'erc-compat)
 (eval-when-compile (require 'cl))
 (autoload 'erc-with-buffer "erc" nil nil 'macro)
-(autoload 'erc-log "erc" nil nil 'macro)
+(autoload 'erc-log "erc")
 
 ;;;; Variables and options
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index bbd9dad4310..2e97131b603 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -362,13 +362,12 @@ nicknames with erc-server-user struct instances.")
 (defmacro erc-with-server-buffer (&rest body)
   "Execute BODY in the current ERC server buffer.
 If no server buffer exists, return nil."
+  (declare (indent 0) (debug (body)))
   (let ((buffer (make-symbol "buffer")))
     `(let ((,buffer (erc-server-buffer)))
        (when (buffer-live-p ,buffer)
          (with-current-buffer ,buffer
            ,@body)))))
-(put 'erc-with-server-buffer 'lisp-indent-function 0)
-(put 'erc-with-server-buffer 'edebug-form-spec '(body))
 
 (defstruct (erc-server-user (:type vector) :named)
   ;; User data
@@ -1236,6 +1235,7 @@ Example:
                'erc-replace-insert))
     ((remove-hook 'erc-insert-modify-hook
                   'erc-replace-insert)))"
+  (declare (doc-string 3))
   (let* ((sn (symbol-name name))
          (mode (intern (format "erc-%s-mode" (downcase sn))))
          (group (intern (format "erc-%s" (downcase sn))))
@@ -1281,8 +1281,6 @@ if ARG is omitted or nil.
        (put ',enable  'definition-name ',name)
        (put ',disable 'definition-name ',name))))
 
-(put 'define-erc-module 'doc-string-elt 3)
-
 (defun erc-once-with-server-event (event &rest forms)
   "Execute FORMS the next time EVENT occurs in the `current-buffer'.
 
@@ -1334,10 +1332,10 @@ connection over which the data was received that triggered EVENT."
      (add-hook hook fun nil nil)
      fun))
 
-(defmacro erc-log (string)
+(defsubst erc-log (string)
   "Logs STRING if logging is on (see `erc-log-p')."
-  `(when erc-log-p
-     (erc-log-aux ,string)))
+  (when erc-log-p
+    (erc-log-aux string)))
 
 (defun erc-server-buffer ()
   "Return the server buffer for the current buffer's process.
@@ -1621,6 +1619,7 @@ See `erc-get-buffer' for details.
 See also `with-current-buffer'.
 
 \(fn (TARGET [PROCESS]) BODY...)"
+  (declare (indent 1) (debug ((form &optional form) body)))
   (let ((buf (make-symbol "buf"))
         (proc (make-symbol "proc"))
         (target (make-symbol "target"))
@@ -1637,8 +1636,6 @@ See also `with-current-buffer'.
        (when (buffer-live-p ,buf)
          (with-current-buffer ,buf
            ,@body)))))
-(put 'erc-with-buffer 'lisp-indent-function 1)
-(put 'erc-with-buffer 'edebug-form-spec '((form &optional form) body))
 
 (defun erc-get-buffer (target &optional proc)
   "Return the buffer matching TARGET in the process PROC.
@@ -1688,6 +1685,7 @@ needs to match PROC."
 FORMS will be evaluated in all buffers having the process PROCESS and
 where PRED matches or in all buffers of the server process if PRED is
 nil."
+  (declare (indent 1) (debug (form form body)))
   ;; Make the evaluation have the correct order
   (let ((pre (make-symbol "pre"))
         (pro (make-symbol "pro")))
@@ -1701,8 +1699,6 @@ nil."
        ;; Silence the byte-compiler by binding the result of mapcar to
        ;; a variable.
        res)))
-(put 'erc-with-all-buffers-of-server 'lisp-indent-function 1)
-(put 'erc-with-all-buffers-of-server 'edebug-form-spec '(form form body))
 
 ;; (iswitchb-mode) will autoload iswitchb.el
 (defvar iswitchb-temp-buflist)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c6b2a4c37a7..dade2b4bbe5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-17  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
+
+        * starttls.el (starttls-extra-arguments): Doc fix.
+
 2012-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * shr.el (shr-insert): \r is also not inserted, so don't try to delete
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 2d403650533..346e76b2ccc 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -149,7 +149,7 @@ These apply when the `starttls' command is used, i.e. when
   :group 'starttls)
 
 (defcustom starttls-extra-arguments nil
-  "Extra arguments to `starttls-program'.
+  "Extra arguments to `starttls-gnutls-program'.
 These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
 
 For example, non-TLS compliant servers may require
diff --git a/lisp/replace.el b/lisp/replace.el
index e714015fccf..4013e4e5df5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1603,9 +1603,13 @@ Comma to replace but not move point immediately,
 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again),
 C-w to delete match and recursive edit,
 C-l to clear the screen, redisplay, and offer same replacement again,
-! to replace all remaining matches with no more questions,
+! to replace all remaining matches in this buffer with no more questions,
 ^ to move point back to previous match,
-E to edit the replacement string"
+E to edit the replacement string.
+In multi-buffer replacements type `Y' to replace all remaining
+matches in all remaining buffers with no more questions,
+`N' to skip to the next buffer without replacing remaining matches
+in the current buffer."
   "Help message while in `query-replace'.")
 
 (defvar query-replace-map
diff --git a/lisp/wdired.el b/lisp/wdired.el
index b893e8f6f2b..266d1993389 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -180,7 +180,7 @@ program `dired-chmod-program', which must exist."
 (defvar wdired-col-perm) ;; Column where the permission bits start
 (defvar wdired-old-content)
 (defvar wdired-old-point)
-
+(defvar wdired-old-marks)
 
 (defun wdired-mode ()
   "Writable Dired (WDired) mode.
@@ -221,6 +221,8 @@ See `wdired-mode'."
     (error "Not a Dired buffer"))
   (set (make-local-variable 'wdired-old-content)
        (buffer-substring (point-min) (point-max)))
+  (set (make-local-variable 'wdired-old-marks)
+       (dired-remember-marks (point-min) (point-max)))
   (set (make-local-variable 'wdired-old-point) (point))
   (set (make-local-variable 'query-replace-skip-read-only) t)
   (set (make-local-variable 'isearch-filter-predicate)
@@ -455,7 +457,8 @@ non-nil means return old filename."
               (push (cons tmp file-new) residue))))
          (t
           (setq progress t)
-          (let ((file-ori (car rename)))
+          (let* ((file-ori (car rename))
+                 (old-mark (cdr (assoc file-ori wdired-old-marks))))
             (if wdired-use-interactive-rename
                 (wdired-search-and-rename file-ori file-new)
               ;; If dired-rename-file autoloads dired-aux while
@@ -466,12 +469,17 @@ non-nil means return old filename."
               (condition-case err
                   (let ((dired-backup-overwrite nil))
                     (dired-rename-file file-ori file-new
-                                       overwrite))
+                                       overwrite)
+                    (dired-remove-file file-ori)
+                    (dired-add-file file-new (if (integerp dired-keep-marker-rename)
+                                                 dired-keep-marker-rename
+                                               old-mark)))
                 (error
                  (setq errors (1+ errors))
                  (dired-log (concat "Rename `" file-ori "' to `"
                                     file-new "' failed:\n%s\n")
-                            err)))))))))
+                            err)
+                 (dired-add-entry file-ori old-mark)))))))))
     errors))
 
 
diff --git a/lisp/window.el b/lisp/window.el
index b033f9c26e3..a17e0adcdfe 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5361,8 +5361,16 @@ BUFFER-OR-NAME must be a buffer or the name of an existing
 buffer.  Return the window chosen for displaying BUFFER-OR-NAME,
 or nil if no such window is found.
 
-Optional argument ACTION should have the form (FUNCTION . ALIST).
-FUNCTION is either a function or a list of functions.
+Optional argument ACTION, if non-nil, should specify a display
+action.  Its form is described below.
+
+Optional argument FRAME, if non-nil, acts like an additional
+ALIST entry (reusable-frames . FRAME) to the action list of ACTION,
+specifying the frame(s) to search for a window that is already
+displaying the buffer.  See `display-buffer-reuse-window'
+
+If ACTION is non-nil, it should have the form (FUNCTION . ALIST),
+where FUNCTION is either a function or a list of functions, and
 ALIST is an arbitrary association list (alist).
 
 Each such FUNCTION should accept two arguments: the buffer to
@@ -5379,6 +5387,9 @@ function in the combined function list in turn, passing the
 buffer as the first argument and the combined alist as the second
 argument, until one of the functions returns non-nil.
 
+If ACTION is nil, the function list and the alist are built using
+only the other variables mentioned above.
+
 Available action functions include:
  `display-buffer-same-window'
  `display-buffer-reuse-window'
@@ -5407,12 +5418,7 @@ The ACTION argument to `display-buffer' can also have a non-nil
 and non-list value.  This means to display the buffer in a window
 other than the selected one, even if it is already displayed in
 the selected window.  If called interactively with a prefix
-argument, ACTION is t.
-
-Optional argument FRAME, if non-nil, acts like an additional
-ALIST entry (reusable-frames . FRAME), specifying the frame(s) to
-search for a window that is already displaying the buffer.  See
-`display-buffer-reuse-window'."
+argument, ACTION is t."
   (interactive (list (read-buffer "Display buffer: " (other-buffer))
                      (if current-prefix-arg t)))
   (let ((buffer (if (bufferp buffer-or-name)