Merge from trunk.

30 files changed, 308 insertions, 128 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19c80a65888..6d652931328 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,127 @@
+2011-07-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el: Add advertised binding for set-mark-command
+        (Bug#5772).
+
+2011-07-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el (mode-line-other-buffer):
+        * bookmark.el (bookmark-bmenu-2-window):
+        * bs.el (bs-cycle-next, bs-cycle-previous):
+        * net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using
+        switch-to-buffer.
+
+        * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
+        Deleted.
+
+2011-07-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * follow.el (follow-debug-message, follow-redisplay):
+        * jka-cmpr-hook.el (with-auto-compression-mode):
+        Fix typos in docstrings.
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * subr.el (with-silent-modifications): Clarify somewhat what the
+        macro inhibits (bug#6525).
+
+        * simple.el (eval-expression): Note what it does if called
+        interactively (bug#6495).
+
+2011-07-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW.  Use
+        pop-to-buffer buffer-or-name if it is nil.
+
+        * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
+        Remove switch-to-buffer.
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * files.el (make-directory): Clarify that an error will be raised
+        if there's an error (bug#6397).
+
+        * startup.el (initial-buffer-choice): Add `none' as a choice
+        (bug#6234).
+
+        * subr.el (add-hook): Clarify section about buffer-local hooks
+        (bug#6218).
+
+        * dired.el (dired-flagged): Clarify doc string (bug#6117).
+
+2011-07-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tabify.el (untabify): Preserve the current column so that point
+        doesn't move (bug#6032).
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite
+        to avoid awkward possessive "s" (bug#5986).
+
+2011-07-13  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-use-ls-dired): Doc fix.  (Bug#9039).
+        (dired-insert-directory): Give a message the first time
+        if ls is found not to support --dired.
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * simple.el (toggle-truncate-lines): Clarify what is toggled
+        (bug#5580).  Text by Drew Adams.
+
+2011-07-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (blink-matching-open): Make the error message from the
+        last change less verbose.
+
+2011-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * font-lock.el (font-lock-comment-face): Use the high contrast
+        "yellow" color for font-lock-comment-face on low color terminals
+        using a dark background color (bug#4221).
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired.el (dired-insert-set-properties): Make the doc string
+        reflect what it does now (bug#5325).
+
+        * simple.el (blink-matching-open): Say that we were unable to find
+        the match within the limit, if we're limited (bug#5122).
+
+        * international/mule-cmds.el (prefer-coding-system): Add an
+        example (bug#4869).
+
+        * progmodes/etags.el (tags-search): Document `file-list-form'
+        (bug#4731).
+
+2011-07-13  Lawrence Mitchell  <wence@gmx.li>
+
+        * net/browse-url.el (browse-url-default-browser)
+        (browse-url-browser-function): Make the default browser choice a
+        bit more logical (bug#4300).  Also clean up the doc string.
+
+2011-07-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure
+        binary endings (bug#4440).
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * info.el (info-insert-file-contents): Inhibit jka-compr messages,
+        which can be pretty annoying (bug#8971).
+
+        * jka-compr.el (jka-compr-verbose): New variable, and use
+        throughout (bug#8971).
+
+        * info.el (Info-find-file): Fall back on the installation
+        directory if we can't find the info node anywhere else.
+
+2011-07-13  Sergei Organov  <osv@javad.com>  (tiny change)
+
+        * vc/vc.el (vc-revert-file):
+        Don't set file time-stamp in the past.  (Bug#5181)
+
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * files.el (after-find-file): Give a better error message when
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 2f73c290231..7ba9261ccf0 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -6892,7 +6892,7 @@
         (find-file-noselect): Use it if new optional argument `rawfile' is
         non-nil.
 
-        * startup.el (command-line-1): Add option --eval to evalute an
+        * startup.el (command-line-1): Add option --eval to evaluate an
         expression on the command line and print the result.
 
 1995-08-14  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 99d9aa36e35..c4f9369219a 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -471,8 +471,7 @@ Like `bury-buffer', but temporarily select EVENT's window."
 (defun mode-line-other-buffer () "\
 Switch to the most recently selected buffer other than the current one."
   (interactive)
-  (with-no-warnings ; We really do want to call `switch-to-buffer' here.
-    (switch-to-buffer (other-buffer))))
+  (switch-to-buffer (other-buffer) nil t))
 
 (defun mode-line-next-buffer (event)
   "Like `next-buffer', but temporarily select EVENT's window."
@@ -594,9 +593,12 @@ is okay.  See `mode-line-format'.")
          ".fas" ".lib" ".mem"
          ;; CMUCL
          ".x86f" ".sparcf"
-         ;; Other CL implementations (Allegro, LispWorks, OpenMCL)
-         ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl"
-         ".p64fsl" ".d64fsl" ".dx64fsl"
+         ;; OpenMCL / Clozure CL
+         ".dfsl" ".pfsl" ".d64fsl" ".p64fsl" ".lx64fsl" ".lx32fsl"
+         ".dx64fsl" ".dx32fsl" ".fx64fsl" ".fx32fsl" ".sx64fsl"
+         ".sx32fsl" ".wx64fsl" ".wx32fsl"
+         ;; Other CL implementations (Allegro, LispWorks)
+         ".fasl" ".ufsl" ".fsl" ".dxl"
          ;; Libtool
          ".lo" ".la"
          ;; Gettext
@@ -847,6 +849,8 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key global-map "\C-@" 'set-mark-command)
 ;; Many people are used to typing C-SPC and getting C-@.
 (define-key global-map [?\C- ] 'set-mark-command)
+(put 'set-mark-command :advertised-binding [?\C- ])
+
 (define-key ctl-x-map "\C-x" 'exchange-point-and-mark)
 (define-key ctl-x-map "\C-@" 'pop-global-mark)
 (define-key ctl-x-map [?\C- ] 'pop-global-mark)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 9f90ecedc4d..bb7ad153e8b 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1841,8 +1841,7 @@ With a prefix arg, prompts for a file to save them in."
         (menu (current-buffer))
         (pop-up-windows t))
     (delete-other-windows)
-    (with-no-warnings ; We really do want to call `switch-to-buffer' here.
-      (switch-to-buffer (other-buffer)))
+    (switch-to-buffer (other-buffer) nil t)
     (bookmark--jump-via bmrk 'pop-to-buffer)
     (bury-buffer menu)))
 
diff --git a/lisp/bs.el b/lisp/bs.el
index c7326eedd26..49ffb3f822c 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1215,8 +1215,7 @@ by buffer configuration `bs-cycle-configuration-name'."
         ;; We don't want the frame iconified if the only window in the frame
         ;; happens to be dedicated.
         (bury-buffer (current-buffer))
-        (with-no-warnings ; We really do want to call `switch-to-buffer' here.
-          (switch-to-buffer next))
+        (switch-to-buffer next nil t)
         (setq bs--cycle-list (append (cdr cycle-list)
                                      (list (car cycle-list))))
         (bs-message-without-log "Next buffers: %s"
@@ -1245,8 +1244,7 @@ by buffer configuration `bs-cycle-configuration-name'."
                                             bs--cycle-list)))
              (prev-buffer (car tupel))
              (cycle-list (cdr tupel)))
-        (with-no-warnings ; We really do want to call `switch-to-buffer' here.
-          (switch-to-buffer prev-buffer))
+        (switch-to-buffer prev-buffer nil t)
         (setq bs--cycle-list (append (last cycle-list)
                                      (reverse (cdr (reverse cycle-list)))))
         (bs-message-without-log "Previous buffers: %s"
diff --git a/lisp/dired.el b/lisp/dired.el
index 62420348d0f..01d41bba27d 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -78,10 +78,22 @@ If nil, `dired-listing-switches' is used."
   :type 'file)
 
 (defcustom dired-use-ls-dired 'unspecified
-  "Non-nil means Dired should use \"ls --dired\".
+  "Non-nil means Dired should pass the \"--dired\" option to \"ls\".
 The special value of `unspecified' means to check explicitly, and
 save the result in this variable.  This is performed the first
-time `dired-insert-directory' is called."
+time `dired-insert-directory' is called.
+
+Note that if you set this option to nil, either through choice or
+because your \"ls\" program does not support \"--dired\", Dired
+will fail to parse some \"unusual\" file names, e.g. those with leading
+spaces.  You might want to install ls from GNU Coreutils, which does
+support this option.  Alternatively, you might want to use Emacs's
+own emulation of \"ls\", by using:
+  \(setq ls-lisp-use-insert-directory-program nil)
+  \(require 'ls-lisp)
+This is used by default on MS Windows, which does not have an \"ls\" program.
+Note that `ls-lisp' does not support as many options as GNU ls, though.
+For more details, see Info node `(emacs)ls in Lisp'."
   :group 'dired
   :type '(choice (const :tag "Check for --dired support" unspecified)
                  (const :tag "Do not use --dired" nil)
@@ -339,11 +351,11 @@ Subexpression 2 must end right before the \\n or \\r.")
 
 (defface dired-flagged
   '((t (:inherit font-lock-warning-face)))
-  "Face used for flagged files."
+  "Face used for files flagged for deletion."
   :group 'dired-faces
   :version "22.1")
 (defvar dired-flagged-face 'dired-flagged
-  "Face name used for flagged files.")
+  "Face name used for files flagged for deletion.")
 
 (defface dired-warning
   ;; Inherit from font-lock-warning-face since with min-colors 8
@@ -1119,9 +1131,13 @@ If HDR is non-nil, insert a header line with the directory name."
          (or (if (eq dired-use-ls-dired 'unspecified)
                  ;; Check whether "ls --dired" gives exit code 0, and
                  ;; save the answer in `dired-use-ls-dired'.
-                 (setq dired-use-ls-dired
-                       (eq (call-process insert-directory-program nil nil nil "--dired")
-                           0))
+                 (or (setq dired-use-ls-dired
+                           (eq 0 (call-process insert-directory-program
+                                             nil nil nil "--dired")))
+                     (progn
+                       (message "ls does not support --dired; \
+see `dired-use-ls-dired' for more details.")
+                       nil))
                dired-use-ls-dired)
              (file-remote-p dir)))
         (setq switches (concat "--dired " switches)))
@@ -1175,7 +1191,7 @@ If HDR is non-nil, insert a header line with the directory name."
         (insert "  wildcard " (file-name-nondirectory dir) "\n")))))
 
 (defun dired-insert-set-properties (beg end)
-  "Make the file names highlight when the mouse is on them."
+  "Add various text properties to the lines in the region."
   (save-excursion
     (goto-char beg)
     (while (< (point) end)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 223e9667ac3..127f93c6858 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -355,7 +355,7 @@ else the global value will be modified."
 (defvar byte-compile-interactive-only-functions
   '(beginning-of-buffer end-of-buffer replace-string replace-regexp
     insert-file insert-buffer insert-file-literally previous-line next-line
-    goto-line comint-run delete-backward-char switch-to-buffer)
+    goto-line comint-run delete-backward-char)
   "List of commands that are not meant to be called from Lisp.")
 
 (defvar byte-compile-not-obsolete-vars nil
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 2f168180cf6..4c83e7e2e0d 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -28,7 +28,7 @@
 ;; * Use `testcover-mark-all' to add overlay "splotches" to the Lisp file's
 ;;   buffer to show where coverage is lacking.  Normally, a red splotch
 ;;   indicates the form was never evaluated; a brown splotch means it always
-;;   evaluted to the same value.
+;;   evaluated to the same value.
 ;; * Use `testcover-next-mark' (bind it to a key!) to jump to the next spot
 ;;   that has a splotch.
 
diff --git a/lisp/files.el b/lisp/files.el
index bf38ce39a07..0b253fcc297 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4778,7 +4778,10 @@ visited a file in a nonexistent directory.
 
 Noninteractively, the second (optional) argument PARENTS, if
 non-nil, says whether to create parent directories that don't
-exist.  Interactively, this happens by default."
+exist.  Interactively, this happens by default.
+
+If creating the directory or directories fail, an error will be
+raised."
   (interactive
    (list (read-file-name "Make directory: " default-directory default-directory
                          nil nil)
diff --git a/lisp/follow.el b/lisp/follow.el
index 9bf472e547c..94a542f1016 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -118,7 +118,7 @@
 ;; (setq pixel-vertical-clip-threshold 30)
 
 
-;; The correct way to cofigurate Follow mode, or any other mode for
+;; The correct way to configurate Follow mode, or any other mode for
 ;; that matter, is to create one or more functions that do
 ;; whatever you would like to do.  These functions are then added to
 ;; a hook.
@@ -189,7 +189,7 @@
 ;; positions in the text? Here are two simple methods to use:
 ;;
 ;; 1) Use multiple frames; `follow' mode only affects windows displayed
-;;    in the same frame. (My apoligies to you who can't use frames.)
+;;    in the same frame. (My apologies to you who can't use frames.)
 ;;
 ;; 2) Bind `follow-mode' to key so you can turn it off whenever
 ;;    you want to view two locations.  Of course, `follow' mode can
@@ -209,15 +209,15 @@
 ;;
 ;; Follow mode does this in three places:
 ;; 1) After each user command.
-;; 2) After a process output has been perfomed.
+;; 2) After a process output has been performed.
 ;; 3) When a scrollbar has been moved.
 ;;
 ;; This will cover most situations. (Let me know if there are other
 ;; situations that should be covered.)
 ;;
 ;; Note that only the selected window is checked, for the reason of
-;; efficiency and code complexity. (I.e. it is possible to make a
-;; non-selected windows unaligned.  It will, however, pop right back
+;; efficiency and code complexity.  (I.e. it is possible to make a
+;; non-selected window unaligned.  It will, however, pop right back
 ;; when it is selected.)
 
 ;;}}}
@@ -244,7 +244,7 @@
 ;;      (funcall (symbol-function 'set) 'bar ...)
 ;;
 ;; Note: When this file is interpreted, `eval-when-compile' is
-;; evaluted.  Since it doesn't hurt to evaluate it, but it is a bit
+;; evaluated.  Since it doesn't hurt to evaluate it, but it is a bit
 ;; annoying, we test if the byte-compiler has been loaded.  This can,
 ;; of course, lead to some occasional unintended evaluation...
 ;;
@@ -456,7 +456,7 @@ Used by `follow-window-size-change'.")
 ;; the variable is not set.
 
 (defsubst follow-debug-message (&rest args)
-  "Like message, but only active when `follow-debug' is non-nil."
+  "Like `message', but only active when `follow-debug' is non-nil."
   (if (and (boundp 'follow-debug) follow-debug)
       (apply 'message args)))
 
@@ -1000,7 +1000,7 @@ Note that this handles the case when the cache has been set to nil."
     res))
 
 
-;; Make sure WIN always starts at the beginning of an whole screen
+;; Make sure WIN always starts at the beginning of a whole screen
 ;; line. If WIN is not aligned the start is updated which probably
 ;; will lead to a redisplay of the screen later on.
 ;;
@@ -1057,8 +1057,8 @@ Return the selected window."
     win))
 
 
-;; Lets select a window showing the end. Make sure we only select it if it
-;; it wasn't just moved here. (i.e. M-> shall not unconditionally place
+;; Lets select a window showing the end. Make sure we only select it if
+;; it wasn't just moved here. (I.e. M-> shall not unconditionally place
 ;; the point in the selected window.)
 ;;
 ;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max';
@@ -1134,7 +1134,7 @@ Otherwise, return nil."
   "Reposition the WINDOWS around WIN.
 Should the point be too close to the roof we redisplay everything
 from the top.  WINDOWS should contain a list of windows to
-redisplay, it is assumed that WIN is a member of the list.
+redisplay; it is assumed that WIN is a member of the list.
 Should WINDOWS be nil, the windows displaying the
 same buffer as WIN, in the current frame, are used.
 Should WIN be nil, the selected window is used.
@@ -1231,7 +1231,7 @@ should be a member of WINDOWS, starts at position START."
                  (setq done t res (point)))
                 ((= win-start start)    ; Perfect match, use this value
                  (setq done t res (point)))
-                ((< win-start start)    ; Walked to far, use preious result
+                ((< win-start start)    ; Walked to far, use previous result
                  (setq done t))
                 (t                      ; Store result for next iteration
                  (setq res (point))))))
@@ -1241,12 +1241,12 @@ should be a member of WINDOWS, starts at position START."
 ;;{{{ Avoid tail recenter
 
 ;; This sets the window internal flag `force_start'. The effect is that
-;; windows only displaying the tail isn't recentered.
+;; windows only displaying the tail aren't recentered.
 ;; Has to be called before every redisplay... (Great isn't it?)
 ;;
 ;; XEmacs doesn't recenter the tail, GOOD!
 ;;
-;; A window displaying only the tail, is a windows whose
+;; A window displaying only the tail, is a window whose
 ;; window-start position is equal to (point-max) of the buffer it
 ;; displays.
 ;;
@@ -1487,12 +1487,12 @@ non-first windows in Follow mode."
 ;;;; Scroll-bar support code.
 
 ;; Why is it needed? Well, if the selected window is in follow mode,
-;; all its follower stick to it blindly. If one of them is scrolled,
+;; all its followers stick to it blindly. If one of them is scrolled,
 ;; it immediately returns to the original position when the mouse is
 ;; released. If the selected window is not a follower of the dragged
 ;; window the windows will be unaligned.
 
-;; The advices doesn't get compiled. Aestetically, this might be a
+;; The advices don't get compiled. Aesthetically, this might be a
 ;; problem but in practical life it isn't.
 
 ;; Discussion: Now when the other windows in the chain follow the
@@ -1700,8 +1700,8 @@ magic stuff before the real process filter is called."
 ;;}}}
 ;;{{{ Start/stop interception of processes.
 
-;; Normally, all new processed are intercepted by our `set-process-filter'.
-;; This is needed to intercept old processed that were started before we were
+;; Normally, all new processes are intercepted by our `set-process-filter'.
+;; This is needed to intercept old processes that were started before we were
 ;; loaded, and processes we have forgotten by calling
 ;; `follow-stop-intercept-process-output'.
 
@@ -1749,7 +1749,7 @@ report this using the `report-emacs-bug' function."
 
 ;; The following section is a naive method to make buffers with
 ;; process output to work with Follow mode. Whenever the start of the
-;; window displaying the buffer is moved, we moves it back to its
+;; window displaying the buffer is moved, we move it back to its
 ;; original position and try to select a new window.  (If we fail,
 ;; the normal redisplay functions of Emacs will scroll it right
 ;; back!)
@@ -1767,7 +1767,7 @@ report this using the `report-emacs-bug' function."
 
     ;; If input is pending, the `sit-for' below won't redraw the
     ;; display. In that case, calling `follow-avoid-tail-recenter' may
-    ;; provoke the process hadnling code to sceduling a redisplay.
+    ;; provoke the process handling code to schedule a redisplay.
     ;(or (input-pending-p)
     ; (follow-avoid-tail-recenter))
 
@@ -1788,7 +1788,7 @@ report this using the `report-emacs-bug' function."
               (inhibit-read-only t))
           (save-excursion
             (goto-char (process-mark proc))
-            ;; `insert-before-markers' just in case the users next
+            ;; `insert-before-markers' just in case the user's next
             ;; command is M-y.
             (insert-before-markers output)
             (set-marker (process-mark proc) (point)))
@@ -1848,7 +1848,7 @@ report this using the `report-emacs-bug' function."
                    (t
                     (follow-debug-message "filter: nothing")))
 
-                  ;; Here we have slected a window. Make sure the
+                  ;; Here we have selected a window. Make sure the
                   ;; windows are aligned and the point is visible
                   ;; in the selected window.
                   (if (and (not (follow-pos-visible
@@ -1866,7 +1866,7 @@ report this using the `report-emacs-bug' function."
     ;; return to the original window.
     (if return-to-orig-win
         (select-window orig-win))
-    ;; Restore the orignal buffer, unless the filter explicitly
+    ;; Restore the original buffer, unless the filter explicitly
     ;; changed buffer or killed the old buffer.
     (if (and (eq buf (current-buffer))
              (buffer-name old-buffer))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 3743dd54b7a..6c76142c59d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1856,19 +1856,13 @@ Sets various variables using `font-lock-defaults' and
     (((class color) (min-colors 8) (background light))
      (:foreground "red"))
     (((class color) (min-colors 8) (background dark))
-     )
+     (:foreground "yellow"))
     (t (:weight bold :slant italic)))
   "Font Lock mode face used to highlight comments."
   :group 'font-lock-faces)
 
 (defface font-lock-comment-delimiter-face
-  '((default :inherit font-lock-comment-face)
-    (((class grayscale)))
-    (((class color) (min-colors 16)))
-    (((class color) (min-colors 8) (background light))
-     :foreground "red")
-    (((class color) (min-colors 8) (background dark))
-     :foreground "red1"))
+  '((default :inherit font-lock-comment-face))
   "Font Lock mode face used to highlight comment delimiters."
   :group 'font-lock-faces)
 
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 4882032f284..779c84296f4 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -9243,7 +9243,7 @@
         (nnmaildir--with-nntp-buffer, nnmaildir--with-work-buffer,
         nnmaildir--with-nov-buffer, nnmaildir--with-move-buffer,
         nnmaildir--group-ls): New macros/functions.  Use them.
-        (nnmaildir--unlink): Evalutate argument only once.
+        (nnmaildir--unlink): Evaluate argument only once.
 
 2002-03-27  Jesper Harder  <harder@ifa.au.dk>
 
diff --git a/lisp/info.el b/lisp/info.el
index 29daac566d1..cbdc8cc7ab3 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -464,6 +464,7 @@ be last in the list.")
   "Insert the contents of an Info file in the current buffer.
 Do the right thing if the file has been compressed or zipped."
   (let* ((tail Info-suffix-list)
+         (jka-compr-verbose nil)
          (lfn (if (fboundp 'msdos-long-file-names)
                   (msdos-long-file-names)
                 t))
@@ -728,6 +729,11 @@ just return nil (no error)."
                           (append Info-directory-list
                                   Info-additional-directory-list)
                         Info-directory-list)))))
+        ;; Fall back on the installation directory if we can't find
+        ;; the info node anywhere else.
+        (when installation-directory
+          (setq dirs (append dirs (list (expand-file-name
+                                         "info" installation-directory)))))
         ;; Search the directory list for file FILENAME.
         (while (and dirs (not found))
           (setq temp (expand-file-name filename (car dirs)))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index e75a22d6415..6a73aaaa838 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -397,7 +397,11 @@ If CODING-SYSTEM specifies a certain type of EOL conversion, the coding
 systems set by this function will use that type of EOL conversion.
 
 A coding system that requires automatic detection of text+encoding
-\(e.g. undecided, unix) can't be preferred."
+\(e.g. undecided, unix) can't be preferred.
+
+To prefer, for instance, utf-8, say the following:
+
+  \(prefer-coding-system 'utf-8)"
   (interactive "zPrefer coding system: ")
   (if (not (and coding-system (coding-system-p coding-system)))
       (error "Invalid coding system `%s'" coding-system))
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index fda9804bbb8..e1cf2a661ed 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -340,7 +340,7 @@ Return the new status of auto compression (non-nil means on)."
      (t (jka-compr-uninstall)))))
 
 (defmacro with-auto-compression-mode (&rest body)
-  "Evalute BODY with automatic file compression and uncompression enabled."
+  "Evaluate BODY with automatic file compression and uncompression enabled."
   (declare (indent 0))
   (let ((already-installed (make-symbol "already-installed")))
     `(let ((,already-installed (jka-compr-installed-p)))
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 37c9d40ec65..1893e982bbb 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -97,6 +97,11 @@ NOTE: Not used in MS-DOS and Windows systems."
   :type 'string
   :group 'jka-compr)
 
+(defcustom jka-compr-verbose t
+  "If non-nil, output messages whenever compressing or uncompressing files."
+  :type 'boolean
+  :group 'jka-compr)
+
 (defvar jka-compr-use-shell
   (not (memq system-type '(ms-dos windows-nt))))
 
@@ -309,6 +314,7 @@ There should be no more than seven characters after the final `/'."
 
           (and
            compress-message
+           jka-compr-verbose
            (message "%s %s..." compress-message base-name))
 
           (jka-compr-run-real-handler 'write-region
@@ -341,6 +347,7 @@ There should be no more than seven characters after the final `/'."
 
           (and
            compress-message
+           jka-compr-verbose
            (message "%s %s...done" compress-message base-name))
 
           (cond
@@ -404,6 +411,7 @@ There should be no more than seven characters after the final `/'."
 
               (and
                uncompress-message
+               jka-compr-verbose
                (message "%s %s..." uncompress-message base-name))
 
               (condition-case error-code
@@ -479,6 +487,7 @@ There should be no more than seven characters after the final `/'."
 
         (and
          uncompress-message
+         jka-compr-verbose
          (message "%s %s...done" uncompress-message base-name))
 
         (and
@@ -534,6 +543,7 @@ There should be no more than seven characters after the final `/'."
 
                 (and
                  uncompress-message
+                 jka-compr-verbose
                  (message "%s %s..." uncompress-message base-name))
 
                 ;; Here we must read the output of uncompress program
@@ -554,6 +564,7 @@ There should be no more than seven characters after the final `/'."
 
                   (and
                    uncompress-message
+                   jka-compr-verbose
                    (message "%s %s...done" uncompress-message base-name))
 
                   (write-region
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index ac12030471e..e18b42a275f 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -214,13 +214,7 @@
 
 ;;;###autoload
 (defcustom browse-url-browser-function
-  (cond
-   ((memq system-type '(windows-nt ms-dos cygwin))
-    'browse-url-default-windows-browser)
-   ((memq system-type '(darwin))
-    'browse-url-default-macosx-browser)
-   (t
-    'browse-url-default-browser))
+  'browse-url-default-browser
   "Function to display the current buffer in a WWW browser.
 This is used by the `browse-url-at-point', `browse-url-at-mouse', and
 `browse-url-of-file' commands.
@@ -908,12 +902,13 @@ a random existing one.  A non-nil interactive prefix argument reverses
 the effect of `browse-url-new-window-flag'.
 
 When called non-interactively, optional second argument NEW-WINDOW is
-used instead of `browse-url-new-window-flag'.
-
-The order attempted is gnome-moz-remote, Mozilla, Firefox,
-Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
+used instead of `browse-url-new-window-flag'."
   (apply
    (cond
+    ((memq system-type '(windows-nt ms-dos cygwin))
+     'browse-url-default-windows-browser)
+    ((memq system-type '(darwin))
+     'browse-url-default-macosx-browser)
     ((browse-url-can-use-xdg-open) 'browse-url-xdg-open)
     ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
     ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index f20040e8a9a..fcf523a7068 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -308,7 +308,7 @@ buffer in your bug report.
 
       ;; There is at least one Tramp buffer.
       (when buffer-list
-        (tramp-compat-pop-to-buffer-same-window (list-buffers-noselect nil))
+        (switch-to-buffer (list-buffers-noselect nil))
         (delete-other-windows)
         (setq buffer-read-only nil)
         (goto-char (point-min))
@@ -343,7 +343,7 @@ the debug buffer(s).")
             ;; OK, let's send.  First we delete the buffer list.
             (progn
               (kill-buffer nil)
-              (tramp-compat-pop-to-buffer-same-window curbuf)
+              (switch-to-buffer curbuf)
               (goto-char (point-max))
               (insert "\n\
 This is a special notion of the `gnus/message' package.  If you
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index e7ea4354b51..460c9f0e118 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -502,15 +502,6 @@ EOL-TYPE can be one of `dos', `unix', or `mac'."
                         "`dos', `unix', or `mac'")))))
         (t (error "Can't change EOL conversion -- is MULE missing?"))))
 
-;; `pop-to-buffer-same-window'  has been introduced with Emacs 24.1.
-(defun tramp-compat-pop-to-buffer-same-window
-  (&optional buffer-or-name norecord label)
-  "Pop to buffer specified by BUFFER-OR-NAME in the selected window."
-  (if (fboundp 'pop-to-buffer-same-window)
-      (tramp-compat-funcall
-       'pop-to-buffer-same-window buffer-or-name norecord label)
-    (tramp-compat-funcall 'switch-to-buffer buffer-or-name norecord)))
-
 (add-hook 'tramp-unload-hook
           (lambda ()
             (unload-feature 'tramp-compat 'force)))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 48df73a678f..ad3b777977c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -613,7 +613,7 @@ One should tune up `cperl-close-paren-offset' as well."
 (defcustom cperl-syntaxify-by-font-lock
   (and cperl-can-font-lock
        (boundp 'parse-sexp-lookup-properties))
-  "*Non-nil means that CPerl uses `font-lock's routines for syntaxification."
+  "*Non-nil means that CPerl uses the `font-lock' routines for syntaxification."
   :type '(choice (const message) boolean)
   :group 'cperl-speed)
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 8abf298bb76..385adf1af0a 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1860,7 +1860,11 @@ nil, we exit; otherwise we scan the next file."
 Stops when a match is found.
 To continue searching for next match, use command \\[tags-loop-continue].
 
-See documentation of variable `tags-file-name'."
+If `file-list-form' is non-nil, it should be a form that, when
+evaluated, will return a list of file names.  The search will be
+restricted to these files.
+
+Aleso see the documentation of the `tags-file-name' variable."
   (interactive "sTags search (regexp): ")
   (if (and (equal regexp "")
            (eq (car tags-loop-scan) 're-search-forward)
diff --git a/lisp/simple.el b/lisp/simple.el
index 2c792a2c78e..64333402924 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1152,6 +1152,8 @@ display the result of expression evaluation."
 (defun eval-expression (eval-expression-arg
                         &optional eval-expression-insert-value)
   "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
+When called interactively, read an Emacs Lisp expression and
+evaluate it.
 Value is also consed on to front of the variable `values'.
 Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively,
 with prefix argument) means insert the result into the current buffer
@@ -5303,11 +5305,12 @@ The variable `selective-display' has a separate value for each buffer."
 (defvaralias 'indicate-unused-lines 'indicate-empty-lines)
 
 (defun toggle-truncate-lines (&optional arg)
-  "Toggle whether to fold or truncate long lines for the current buffer.
+  "Toggle truncating of long lines for the current buffer.
+When truncating is off, long lines are folded.
 With prefix argument ARG, truncate long lines if ARG is positive,
-otherwise don't truncate them.  Note that in side-by-side windows,
-this command has no effect if `truncate-partial-width-windows'
-is non-nil."
+otherwise fold them.  Note that in side-by-side windows, this
+command has no effect if `truncate-partial-width-windows' is
+non-nil."
   (interactive "P")
   (setq truncate-lines
         (if (null arg)
@@ -5520,8 +5523,8 @@ The function should return non-nil if the two tokens do not match.")
                 (minibuffer-message "Mismatched parentheses")
               (message "Mismatched parentheses"))
           (if (minibufferp)
-              (minibuffer-message "Unmatched parenthesis")
-            (message "Unmatched parenthesis"))))
+              (minibuffer-message "No matching parenthesis found")
+            (message "No matching parenthesis found"))))
        ((not blinkpos) nil)
        ((pos-visible-in-window-p blinkpos)
         ;; Matching open within window, temporarily move to blinkpos but only
diff --git a/lisp/startup.el b/lisp/startup.el
index c6f3063ca90..66deb11623a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -41,13 +41,16 @@
 (defcustom initial-buffer-choice nil
   "Buffer to show after starting Emacs.
 If the value is nil and `inhibit-startup-screen' is nil, show the
-startup screen.  If the value is string, visit the specified file or
-directory using `find-file'.  If t, open the `*scratch*' buffer."
+startup screen.  If the value is string, visit the specified file
+or directory using `find-file'.  If t, open the `*scratch*'
+buffer.  If `none', don't select anything, but show the
+buffer (if any) selected by the startup file."
   :type '(choice
           (const     :tag "Startup screen" nil)
           (directory :tag "Directory" :value "~/")
           (file      :tag "File" :value "~/.emacs")
-          (const     :tag "Lisp scratch buffer" t))
+          (const     :tag "Lisp scratch buffer" t)
+          (const     :tag "Select no buffer" 'none))
   :version "23.1"
   :group 'initialization)
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 5c9d6c8d724..5c890eefa29 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1262,10 +1262,10 @@ unless the optional argument APPEND is non-nil, in which case
 FUNCTION is added at the end.
 
 The optional fourth argument, LOCAL, if non-nil, says to modify
-the hook's buffer-local value rather than its default value.
-This makes the hook buffer-local if needed, and it makes t a member
-of the buffer-local value.  That acts as a flag to run the hook
-functions in the default value as well as in the local value.
+the hook's buffer-local value rather than its global value.
+This makes the hook buffer-local, and it makes t a member of the
+buffer-local value.  That acts as a flag to run the hook
+functions of the global value as well as in the local value.
 
 HOOK should be a symbol, and FUNCTION may be any valid function.  If
 HOOK is void, it is first set to nil.  If HOOK's value is a single
@@ -3072,8 +3072,15 @@ See also `with-temp-file' and `with-output-to-string'."
   "Execute BODY, pretending it does not modify the buffer.
 If BODY performs real modifications to the buffer's text, other
 than cosmetic ones, undo data may become corrupted.
-Typically used around modifications of text-properties which do not really
-affect the buffer's content."
+
+This macro will run BODY normally, but doesn't count its buffer
+modifications as being buffer modifications.  This affects things
+like buffer-modified-p, checking whether the file is locked by
+someone else, running buffer modification hooks, and other things
+of that nature.
+
+Typically used around modifications of text-properties which do
+not really affect the buffer's content."
   (declare (debug t) (indent 0))
   (let ((modified (make-symbol "modified")))
     `(let* ((,modified (buffer-modified-p))
diff --git a/lisp/tabify.el b/lisp/tabify.el
index da1038a2164..0b2411d0316 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -34,19 +34,21 @@ Called non-interactively, the region is specified by arguments
 START and END, rather than by the position of point and mark.
 The variable `tab-width' controls the spacing of tab stops."
   (interactive "r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region (point-min) end)
-      (goto-char start)
-      (while (search-forward "\t" nil t)        ; faster than re-search
-        (forward-char -1)
-        (let ((tab-beg (point))
-              (indent-tabs-mode nil)
-              column)
-          (skip-chars-forward "\t")
-          (setq column (current-column))
-          (delete-region tab-beg (point))
-          (indent-to column))))))
+  (let ((c (current-column)))
+    (save-excursion
+      (save-restriction
+        (narrow-to-region (point-min) end)
+        (goto-char start)
+        (while (search-forward "\t" nil t)      ; faster than re-search
+          (forward-char -1)
+          (let ((tab-beg (point))
+                (indent-tabs-mode nil)
+                column)
+            (skip-chars-forward "\t")
+            (setq column (current-column))
+            (delete-region tab-beg (point))
+            (indent-to column)))))
+    (move-to-column c)))
 
 (defvar tabify-regexp " [ \t]+"
   "Regexp matching whitespace that tabify should consider.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 80b970ac02f..6a3638c4232 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-13  Chris Newton  <redshodan@gmail.com>  (tiny change)
+
+        * url-http.el (url-http): Copy over `url-show-status' to the async
+        buffer so that `url-display-percentage' does the right thing
+        (bug#4680).
+
 2011-07-06  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
 
         * url-cache.el (url-cache-extract): Set buffer multibyte flag to
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 7e8b0d958cc..def35449397 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1172,6 +1172,7 @@ CBARGS as the arguments."
                     url-http-after-change-function
                     url-callback-function
                     url-callback-arguments
+                    url-show-status
                     url-http-method
                     url-http-extra-headers
                     url-http-data
@@ -1206,6 +1207,7 @@ CBARGS as the arguments."
                        url-http-chunked-start
                        url-callback-function
                        url-callback-arguments
+                       url-show-status
                        url-http-process
                        url-http-method
                        url-http-extra-headers
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 796311f8f66..6704a43e59b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2428,7 +2428,7 @@ its name; otherwise return nil."
    (list file)
    (let ((backup-file (vc-version-backup-file file)))
      (when backup-file
-       (copy-file backup-file file 'ok-if-already-exists 'keep-date)
+       (copy-file backup-file file 'ok-if-already-exists)
        (vc-delete-automatic-version-backups file))
      (vc-call revert file backup-file))
    `((vc-state . up-to-date)
diff --git a/lisp/window.el b/lisp/window.el
index 999e408bdb1..593fa14d215 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5925,7 +5925,7 @@ buffer with the name BUFFER-OR-NAME and return that buffer."
             buffer))
     (other-buffer)))
 
-(defun switch-to-buffer (buffer-or-name &optional norecord)
+(defun switch-to-buffer (buffer-or-name &optional norecord force-same-window)
   "Switch to buffer BUFFER-OR-NAME in the selected window.
 If called interactively, prompt for the buffer name using the
 minibuffer.  The variable `confirm-nonexistent-file-or-buffer'
@@ -5941,25 +5941,33 @@ BUFFER-OR-NAME is nil, switch to the buffer returned by
 Optional argument NORECORD non-nil means do not put the buffer
 specified by BUFFER-OR-NAME at the front of the buffer list and
 do not make the window displaying it the most recently selected
-one.  Return the buffer switched to.
+one.
 
-This function is intended for interactive use only.  Lisp
-functions should call `pop-to-buffer-same-window' instead."
+If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed
+in the currently selected window; signal an error if that is
+impossible (e.g. if the selected window is minibuffer-only).
+If non-nil, BUFFER-OR-NAME may be displayed in another window.
+
+Return the buffer switched to."
   (interactive
-   (list (read-buffer-to-switch "Switch to buffer: ")))
+   (list (read-buffer-to-switch "Switch to buffer: ") nil nil))
   (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
-    (cond
-     ;; Don't call set-window-buffer if it's not needed since it
-     ;; might signal an error (e.g. if the window is dedicated).
-     ((eq buffer (window-buffer)) nil)
-     ((window-minibuffer-p)
-      (error "Cannot switch buffers in minibuffer window"))
-     ((eq (window-dedicated-p) t)
-      (error "Cannot switch buffers in a dedicated window"))
-     (t (set-window-buffer nil buffer)))
-    (unless norecord
-      (select-window (selected-window)))
-    (set-buffer buffer)))
+    (if (null force-same-window)
+        (pop-to-buffer buffer-or-name
+                       '(same-window (reuse-window-dedicated . weak))
+                       norecord nil)
+      (cond
+       ;; Don't call set-window-buffer if it's not needed since it
+       ;; might signal an error (e.g. if the window is dedicated).
+       ((eq buffer (window-buffer)) nil)
+       ((window-minibuffer-p)
+        (error "Cannot switch buffers in minibuffer window"))
+       ((eq (window-dedicated-p) t)
+        (error "Cannot switch buffers in a dedicated window"))
+       (t (set-window-buffer nil buffer)))
+      (unless norecord
+        (select-window (selected-window)))
+      (set-buffer buffer))))
 
 (defun switch-to-buffer-same-frame (buffer-or-name &optional norecord)
   "Switch to buffer BUFFER-OR-NAME in a window on the selected frame.
diff --git a/lisp/winner.el b/lisp/winner.el
index e5855ad8aac..70038362c2e 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -145,7 +145,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
 
 ;;; Saved configurations
 
-;; This variable contains the window cofiguration rings.
+;; This variable contains the window configuration rings.
 ;; The key in this alist is the frame.
 (defvar winner-ring-alist nil)