Merge from mainline.

26 files changed, 318 insertions, 154 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eb01818750..512e83999ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,114 @@
+2010-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-git.el: Re-flow to fit into 80 columns.
+        (vc-git-after-dir-status-stage, vc-git-dir-status-goto-stage):
+        Remove spurious `quote' element in each case alternative.
+        (vc-git-show-log-entry): Use prog1.
+        (vc-git-after-dir-status-stage): Remove unused var `remaining'.
+
+2010-03-06  Glenn Morris  <rgm@gnu.org>
+
+        * cedet/semantic/grammar.el (semantic-grammar-header-template):
+        Update template copyright to GPLv3+.
+
+2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * man.el (Man-files-regexp): Tighten up the regexp (bug#5686).
+
+2010-03-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * macros.el (insert-kbd-macro): Look up keyboard macro using the
+        definition, not the name (Bug#5481).
+
+2010-03-03  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
+
+        * subr.el (momentary-string-display): Don't overwrite the MESSAGE
+        argument with a local variable.  (Bug#5670)
+
+2010-03-02  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-index-next): Decrement line number by 2.  (Bug#5652)
+
+2010-03-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
+        error when FILENAME and NEWNAME are existing remote directories.
+
+        * net/tramp-compat.el (tramp-compat-make-temp-file): Add optional
+        parameter DIR-FLAG.
+
+2010-03-02  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date
+        of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004).
+
+2010-03-01  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-remove-stale-state-cache):
+        Correct previous patch.
+
+2010-03-01  Kenichi Handa  <handa@m17n.org>
+
+        * language/burmese.el (burmese-composable-pattern): Rename from
+        myanmar-composable-pattern.
+
+        * international/characters.el (script-list):
+        * international/fontset.el (script-representative-chars):
+        Change myanmar to burmese.
+        (otf-script-alist): Likewise.
+        (setup-default-fontset): Likewise.  Re-fix :otf spec.
+
+2010-03-01  Alan Mackenzie  <bug-cc-mode@gnu.org>
+
+        * cc-engine.el (c-remove-stale-state-cache): Take account of when
+        `good-pos' is in the same macro as `here'.  Fixes bug 5649.
+
+2010-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * menu-bar.el (menu-bar-manuals-menu): Fix typo.
+
+2010-02-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * scroll-bar.el (scroll-bar-drag-1): Add save-excursion, bug #5654.
+
+2010-02-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-write-region): START can be a string.
+        Take care in the checks.  Reported by Dan Davison
+        <davison@stats.ox.ac.uk>.
+
+2010-02-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el (dbus-introspect, dbus-get-property)
+        (dbus-set-property, dbus-get-all-properties): Use
+        `dbus-call-method' when noninteractive.  (Bug#5645)
+
+2010-02-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * textmodes/reftex-toc.el (reftex-toc-promote-prepare):
+        * emacs-lisp/elint.el (elint-add-required-env):
+        * cedet/semantic/db-find.el
+        (semanticdb-find-translate-path-brutish-default):
+        * cedet/ede/make.el (ede-make-check-version):
+        * calendar/icalendar.el (icalendar--add-diary-entry):
+        * calc/calcalg2.el (math-tracing-integral):
+        * files.el (recover-session-finish): Use with-current-buffer
+        instead of save-excursion.
+
+2010-02-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Fix in-buffer completion when after-change-functions modify the buffer.
+        * minibuffer.el (completion--replace): New function.
+        (completion--do-completion): Use it and use relative movement.
+
+2010-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * international/fontset.el (setup-default-fontset): Fix :otf spec.
+
 2010-02-27  Jeremy Whitlock  <jcscoobyrs@gmail.com>  (tiny change)
 
-        * progmodes/python.el (python-pdbtrack-stack-entry-regexp): Allow
-        the characters _<> in the stack entry (Bug#5653).
+        * progmodes/python.el (python-pdbtrack-stack-entry-regexp):
+        Allow the characters _<> in the stack entry (Bug#5653).
 
 2010-02-26  Kenichi Handa  <handa@m17n.org>
 
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 3d90de3f0b3..2b45ce1b2f0 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -670,8 +670,8 @@
 (defmacro math-tracing-integral (&rest parts)
   (list 'and
         'trace-buffer
-        (list 'save-excursion
-              '(set-buffer trace-buffer)
+        (list 'with-current-buffer
+              'trace-buffer
               '(goto-char (point-max))
               (list 'and
                     '(bolp)
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 330d3c22cb5..2a7556ff322 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -505,7 +505,9 @@ or ALL is non-nil."
                       (+ abs-p 18)
                     (if (= (% abs-p 7) 6)
                         (+ abs-p 19)
-                      (+ abs-p 20))))
+                      (if (= (% abs-p 7) 2)
+                          (+ abs-p 21)
+                        (+ abs-p 20)))))
                  "Yom HaAtzma'ut")
            (list (calendar-gregorian-from-absolute (+ abs-p 33))
                  "Lag BaOmer")
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 535956be140..a07402aa031 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -2246,8 +2246,7 @@ the entry."
                  'make-diary-entry)
                string non-marking diary-file)))
   ;; Würgaround to remove the trailing blank char
-  (save-excursion
-    (set-buffer (find-file diary-file))
+  (with-current-buffer (find-file diary-file)
     (goto-char (point-max))
     (if (= (char-before) ? )
         (delete-char -1)))
diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el
index e9bc4b3b8e0..6b59f510bed 100644
--- a/lisp/cedet/ede/make.el
+++ b/lisp/cedet/ede/make.el
@@ -76,9 +76,8 @@ If NOERROR is nil, then throw an error on failure.  Return t otherwise."
         (rev nil)
         (ans nil)
         )
-    (save-excursion
+    (with-current-buffer b
       ;; Setup, and execute make.
-      (set-buffer b)
       (setq default-directory cd)
       (erase-buffer)
       (call-process ede-make-command nil b nil
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index eba04a7ee02..754ba231c37 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -326,9 +326,8 @@ Default action as described in `semanticdb-find-translate-path'."
          (cond ((null path) semanticdb-current-database)
                ((semanticdb-table-p path) (oref path parent-db))
                (t (let ((tt (semantic-something-to-tag-table path)))
-                    (save-excursion
-                      ;; @todo - What does this DO ??!?!
-                      (set-buffer (semantic-tag-buffer (car tt)))
+                    ;; @todo - What does this DO ??!?!
+                    (with-current-buffer (semantic-tag-buffer (car tt))
                       semanticdb-current-database))))))
     (apply
      #'nconc
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 2538026a1e3..8f5d1cd3e14 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -573,21 +573,19 @@ Typically a DEFINE expression should look like this:
 ;; X-RCS: " vcid "
 
 ;; This file is not part of GNU Emacs.
-;;
+
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-;;
+;; published by the Free Software Foundation, either version 3 of
+;; the License, or (at your option) any later version.
+
 ;; This software is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 6e0758680d5..b9aa29decd0 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -505,11 +505,10 @@ Return nil if there are no more forms, t otherwise."
         ;; (Messes up the "Initializing elint..." message.)
 ;;;     (message nil)
         (if lib
-            (save-excursion
+            (with-current-buffer (find-file-noselect lib)
               ;; FIXME this doesn't use a temp buffer, because it
               ;; stores the result in buffer-local variables so that
               ;; it can be reused.
-              (set-buffer (find-file-noselect lib))
               (elint-update-env)
               (setq env (elint-env-add-env env elint-buffer-env)))
               ;;; (with-temp-buffer
diff --git a/lisp/files.el b/lisp/files.el
index d6783f82fbb..f0a8d72d3f0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5034,9 +5034,8 @@ This command is used in the special Dired buffer created by
     (dired-unmark 1)
     (dired-do-flagged-delete t)
     (unwind-protect
-        (save-excursion
+        (with-current-buffer buffer
           ;; Read in the auto-save-list file.
-          (set-buffer buffer)
           (erase-buffer)
           (insert-file-contents file)
           ;; Loop thru the text of that file
diff --git a/lisp/info.el b/lisp/info.el
index 93001496b5c..a1ce05d6292 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3062,7 +3062,9 @@ Give an empty topic name to go to the Index node itself."
           num (1- num)))
   (Info-goto-node (nth 1 (car Info-index-alternatives)))
   (if (> (nth 3 (car Info-index-alternatives)) 0)
-      (forward-line (1- (nth 3 (car Info-index-alternatives))))
+      ;; Forward 2 lines less because `Info-find-node-2' initially
+      ;; puts point to the 2nd line.
+      (forward-line (- (nth 3 (car Info-index-alternatives)) 2))
     (forward-line 3)                    ; don't search in headers
     (let ((name (car (car Info-index-alternatives))))
       (Info-find-index-name name)))
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index fb7c573ceac..cf43bb1e6ca 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1124,7 +1124,7 @@ Setup char-width-table appropriate for non-CJK language environment."
          (#x0E00 #x0E5F thai)
          (#x0E80 #x0EDF lao)
          (#x0F00 #x0FFF tibetan)
-         (#x1000 #x109F myanmar)
+         (#x1000 #x109F burmese)
          (#x10A0 #x10FF georgian)
          (#x1100 #x11FF hangul)
          (#x1200 #x139F ethiopic)
@@ -1151,7 +1151,7 @@ Setup char-width-table appropriate for non-CJK language environment."
          (#x3400 #x9FAF han)
          (#xA000 #xA4CF yi)
          (#xAA00 #xAA5F cham)
-         (#xAA60 #xAA7B myanmar)
+         (#xAA60 #xAA7B burmese)
          (#xAA80 #xAADF tai-viet)
          (#xAC00 #xD7AF hangul)
          (#xF900 #xFAFF han)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 767cff850f6..ecb2088de89 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -169,7 +169,7 @@
         (thai #xE17)
         (lao #xEA5)
         (tibetan #xF40)
-        (myanmar #x1000)
+        (burmese #x1000)
         (georgian #x10D3)
         (ethiopic #x1208)
         (cherokee #x13B6)
@@ -260,7 +260,7 @@
         (math . mathematical)
         (mong . mongolian)
         (musc . musical-symbol)
-        (mymr . myanmar)
+        (mymr . burmese)
         (nko\  . nko)
         (ogam . ogham)
         (ital . old_italic)
@@ -415,8 +415,8 @@
      (sinhala ,(font-spec :registry "iso10646-1" :otf '(sinh nil (akhn))))
      (malayalam ,(font-spec :registry "iso10646-1" :otf '(mlym nil (akhn))))
 
-     (myanmar ,(font-spec :registry "iso10646-1" :otf '(mymr))
-              ,(font-spec :registry "iso10646-1" :script 'myanmar))
+     (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr nil nil))
+              ,(font-spec :registry "iso10646-1" :script 'burmese))
 
      (lao ,(font-spec :registry "iso10646-1" :otf '(lao\  nil nil (mark)))
           ,(font-spec :registry "iso10646-1" :script 'lao)
diff --git a/lisp/language/burmese.el b/lisp/language/burmese.el
index 554cd7a482c..a53320b5430 100644
--- a/lisp/language/burmese.el
+++ b/lisp/language/burmese.el
@@ -36,7 +36,7 @@
              (sample-text . "Burmese (မ္ရန္‌မာ) မင္‍ဂလာပာ")
              (documentation . t)))
 
-(defvar myanmar-composable-pattern
+(defvar burmese-composable-pattern
   (let ((table
          '(("K" . "[\u1004\u105A]\u103A\u1039") ; KINZI sequence
            ("C" . "[\u1000-\u102A\u103F\u1041-\u1049\u104E\u105A-\u105D\u1061\u1065-\u1066\u106E\u1071\u1075\u1081\u108E\uAA60-\uAA6F\uAA71-\uAA76]") ; consonant and vowel letter
@@ -52,7 +52,7 @@
                                                regexp t t))))
     regexp))
 
-(let ((elt (list (vector myanmar-composable-pattern 0 'font-shape-gstring)
+(let ((elt (list (vector burmese-composable-pattern 0 'font-shape-gstring)
                  (vector "." 0 'font-shape-gstring))))
   (set-char-table-range composition-function-table '(#x1000 . #x107F) elt)
   (set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt))
diff --git a/lisp/macros.el b/lisp/macros.el
index 4188a432fe5..fa45d8c6108 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -138,7 +138,8 @@ use this command, and then save the file."
         (prin1 definition (current-buffer))))
     (insert ")\n")
     (if keys
-        (let ((keys (where-is-internal macroname '(keymap))))
+        (let ((keys (where-is-internal (symbol-function macroname)
+                                       '(keymap))))
           (while keys
             (insert "(global-set-key ")
             (prin1 (car keys) (current-buffer))
diff --git a/lisp/man.el b/lisp/man.el
index d64846a2d4d..8eb5f73e245 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -283,7 +283,8 @@ This regular expression should start with a `^' character.")
   "Regular expression for SYNOPSIS heading (or your equivalent).
 This regexp should not start with a `^' character.")
 
-(defvar Man-files-regexp "FILES"
+(defvar Man-files-regexp "FILES\\>"
+  ;; Add \> so as not to match mount(8)'s FILESYSTEM INDEPENDENT MOUNT OPTIONS.
   "Regular expression for FILES heading (or your equivalent).
 This regexp should not start with a `^' character.")
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index d740cfce90f..d831744f311 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1500,7 +1500,7 @@ key, a click, or a menu-item")))
 (define-key menu-bar-manuals-menu [emacs-lisp-reference]
   `(menu-item ,(purecopy "Emacs Lisp Reference") menu-bar-read-lispref
               :help ,(purecopy "Read the Emacs Lisp Reference manual")))
-(define-key menu-bar-manuals-menu [emac-lisp-intro]
+(define-key menu-bar-manuals-menu [emacs-lisp-intro]
   `(menu-item ,(purecopy "Introduction to Emacs Lisp") menu-bar-read-lispintro
               :help ,(purecopy "Read the Introduction to Emacs Lisp Programming")))
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d905b9df870..54d155cd510 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -59,6 +59,8 @@
 
 ;; - extend `boundaries' to provide various other meta-data about the
 ;;   output of `all-completions':
+;;   - preferred sorting order when displayed in *Completions*.
+;;   - annotations/text-properties to add when displayed in *Completions*.
 ;;   - quoting/unquoting (so we can complete files names with envvars
 ;;     and backslashes, and all-completion can list names without
 ;;     quoting backslashes and dollars).
@@ -444,6 +446,17 @@ in the last `cdr'."
           (if completions 2 0)
           (if exact       1 0)))
 
+(defun completion--replace (beg end newtext)
+  "Replace the buffer text between BEG and END with NEWTEXT.
+Moves point to the end of the new text."
+  ;; This should be in subr.el.
+  ;; You'd think this is trivial to do, but details matter if you want
+  ;; to keep markers "at the right place" and be robust in the face of
+  ;; after-change-functions that may themselves modify the buffer.
+  (goto-char beg)
+  (insert newtext)
+  (delete-region (point) (+ (point) (- end beg))))
+
 (defun completion--do-completion (&optional try-completion-function)
   "Do the completion and return a summary of what happened.
 M = completion was performed, the text was Modified.
@@ -486,14 +499,12 @@ E = after completion we now have an Exact match.
                                                     string nil nil t))))
              (unchanged (eq t (compare-strings completion nil nil
                                                string nil nil nil))))
-        (unless unchanged
-
-          ;; Insert in minibuffer the chars we got.
+        (if unchanged
           (goto-char end)
-          (insert completion)
-          (delete-region beg end))
-        ;; Move point.
-        (goto-char (+ beg comp-pos))
+          ;; Insert in minibuffer the chars we got.
+          (completion--replace beg end completion))
+        ;; Move point to its completion-mandated destination.
+        (forward-char (- comp-pos (length completion)))
 
         (if (not (or unchanged completed))
            ;; The case of the string changed, but that's all.  We're not sure
@@ -1813,7 +1824,6 @@ PATTERN is as returned by `completion-pcm--string->pattern'."
   (when completions
     (let* ((re (completion-pcm--pattern->regex pattern '(point)))
            (case-fold-search completion-ignore-case))
-      ;; Remove base-size during mapcar, and add it back later.
       (mapcar
        (lambda (str)
          ;; Don't modify the string itself.
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 146cff0544e..5635640cd4c 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -573,7 +573,8 @@ the introspection data, is a string in XML format."
   ;; is used, because the handler can be registered in our Emacs
   ;; instance; caller an callee would block each other.
   (dbus-ignore-errors
-    (dbus-call-method-non-blocking
+    (funcall
+     (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
      bus service path dbus-interface-introspectable "Introspect")))
 
 (defun dbus-introspect-xml (bus service path)
@@ -831,7 +832,8 @@ valid D-Bus value, or `nil' if there is no PROPERTY."
   (dbus-ignore-errors
     ;; "Get" returns a variant, so we must use the `car'.
     (car
-     (dbus-call-method-non-blocking
+     (funcall
+      (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
       bus service path dbus-interface-properties
       "Get" :timeout 500 interface property))))
 
@@ -842,7 +844,8 @@ been set successful, the result is VALUE.  Otherwise, `nil' is
 returned."
   (dbus-ignore-errors
     ;; "Set" requires a variant.
-    (dbus-call-method-non-blocking
+    (funcall
+     (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
      bus service path dbus-interface-properties
      "Set" :timeout 500 interface property (list :variant value))
     ;; Return VALUE.
@@ -857,7 +860,10 @@ name of the property, and its value.  If there are no properties,
     ;; "GetAll" returns "a{sv}".
     (let (result)
       (dolist (dict
-               (dbus-call-method-non-blocking
+               (funcall
+                (if noninteractive
+                    'dbus-call-method
+                  'dbus-call-method-non-blocking)
                 bus service path dbus-interface-properties
                 "GetAll" :timeout 500 interface)
                result)
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 4f930d58cdc..9bcbe21116d 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -215,7 +215,7 @@ this is the function `temp-directory'."
 ;; has been introduced with Emacs 22.  We try it, if it fails, we fall
 ;; back to `make-temp-name', creating the temporary file immediately
 ;; in order to avoid a security hole.
-(defsubst tramp-compat-make-temp-file (filename)
+(defsubst tramp-compat-make-temp-file (filename &optional dir-flag)
   "Create a temporary file (compat function).
 Add the extension of FILENAME, if existing."
   (let* (file-name-handler-alist
@@ -226,21 +226,24 @@ Add the extension of FILENAME, if existing."
          result)
     (condition-case nil
         (setq result
-              (funcall (symbol-function 'make-temp-file) prefix nil extension))
+              (funcall
+               (symbol-function 'make-temp-file) prefix dir-flag extension))
       (error
        ;; We use our own implementation, taken from files.el.
        (while
            (condition-case ()
                (progn
                  (setq result (concat (make-temp-name prefix) extension))
-                 (write-region
-                  "" nil result nil 'silent nil
-                  ;; 7th parameter is MUSTBENEW in Emacs, and
-                  ;; CODING-SYSTEM in XEmacs.  It is not a security
-                  ;; hole in XEmacs if we cannot use this parameter,
-                  ;; because XEmacs uses a user-specific subdirectory
-                  ;; with 0700 permissions.
-                  (when (not (featurep 'xemacs)) 'excl))
+                 (if dir-flag
+                     (make-directory result)
+                   (write-region
+                    "" nil result nil 'silent nil
+                    ;; 7th parameter is MUSTBENEW in Emacs, and
+                    ;; CODING-SYSTEM in XEmacs.  It is not a security
+                    ;; hole in XEmacs if we cannot use this parameter,
+                    ;; because XEmacs uses a user-specific
+                    ;; subdirectory with 0700 permissions.
+                    (when (not (featurep 'xemacs)) 'excl)))
                  nil)
              (file-already-exists t))
          ;; The file was somehow created by someone else between
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 102117f82e9..c029f073724 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3798,13 +3798,12 @@ The method used must be an out-of-band method."
 
           ;; Both are Tramp files.  We shall optimize it, when the
           ;; methods for filename and newname are the same.
-          (let ((tmpfile
-                 (if (file-regular-p filename)
-                     (tramp-compat-make-temp-file localname)
-                   (make-temp-name
-                    (expand-file-name
-                     tramp-temp-name-prefix
-                     (tramp-compat-temporary-file-directory))))))
+          (let* ((dir-flag (file-directory-p filename))
+                 (tmpfile (tramp-compat-make-temp-file localname dir-flag)))
+            (if dir-flag
+                (setq tmpfile
+                      (expand-file-name
+                       (file-name-nondirectory newname) tmpfile)))
             (unwind-protect
                 (progn
                   (tramp-do-copy-or-rename-file-out-of-band
@@ -3813,9 +3812,10 @@ The method used must be an out-of-band method."
                    'rename tmpfile newname keep-date))
               ;; Save exit.
               (condition-case nil
-                  (if (file-regular-p tmpfile)
-                      (delete-file tmpfile)
-                    (delete-directory tmpfile 'recursive))
+                  (if dir-flag
+                      (delete-directory
+                       (expand-file-name ".." tmpfile) 'recursive)
+                    (delete-file tmpfile))
                 (error))))
 
         ;; Expand hops.  Might be necessary for gateway methods.
@@ -5045,11 +5045,12 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
           ;; encoding function, then that is used for encoding the
           ;; contents of the tmp file.
           (cond
-           ;; `rename-file' handles direct copy and out-of-band methods.
+           ;; `copy-file' handles direct copy and out-of-band methods.
            ((or (tramp-local-host-p v)
                 (tramp-method-out-of-band-p
-                 v (- (or end (point-max)) (or start (point-min)))))
-            (if (and (= (or end (point-max)) (point-max))
+                 v (nth 7 (file-attributes tmpfile))))
+            (if (and (not (stringp start))
+                     (= (or end (point-max)) (point-max))
                      (= (or start (point-min)) (point-min))
                      (tramp-get-method-parameter
                       method 'tramp-copy-keep-tmpfile))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 336e2c39262..f4a8c0bf46f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2591,7 +2591,7 @@ comment at the start of cc-engine.el for more info."
   (save-restriction
     (narrow-to-region 1 (point-max))
     (save-excursion
-      (let* ((in-macro-start   ; point-max or beginning of macro containing it
+      (let* ((in-macro-start   ; start of macro containing (point-max) or nil.
               (save-excursion
                 (goto-char (point-max))
                 (and (c-beginning-of-macro)
@@ -2641,7 +2641,9 @@ comment at the start of cc-engine.el for more info."
         ;; (car c-state-cache).  There can be no open parens/braces/brackets
         ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max),
         ;; due to the interface spec to this function.
-        (setq pos (if good-pos-actual-macro-end
+        (setq pos (if (and good-pos-actual-macro-end
+                           (not (eq good-pos-actual-macro-start
+                                    in-macro-start)))
                       (1+ good-pos-actual-macro-end) ; get outside the macro as
                                         ; marked by a `category' text property.
                     good-pos))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index ca0971bf675..610fa14489a 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1186,7 +1186,7 @@ subshells can nest."
   "Variables controlling indentation in shell scripts.
 
 Note: customizing these variables will not affect existing buffers if
-`sh-make-vars-local' is no-nil.  See the documentation for
+`sh-make-vars-local' is non-nil.  See the documentation for
 variable `sh-make-vars-local', command `sh-make-vars-local'
 and command `sh-reset-indent-vars-to-global-values'."
   :group 'sh-script)
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index c28a417a8f3..3f763fc59da 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -210,13 +210,14 @@ EVENT should be a scroll bar click or drag event."
   (let* ((start-position (event-start event))
          (window (nth 0 start-position))
          (portion-whole (nth 2 start-position)))
-    (with-current-buffer (window-buffer window)
-      ;; Calculate position relative to the accessible part of the buffer.
-      (goto-char (+ (point-min)
-                    (scroll-bar-scale portion-whole
-                                      (- (point-max) (point-min)))))
-      (vertical-motion 0 window)
-      (set-window-start window (point)))))
+    (save-excursion 
+      (with-current-buffer (window-buffer window)
+        ;; Calculate position relative to the accessible part of the buffer.
+        (goto-char (+ (point-min)
+                      (scroll-bar-scale portion-whole
+                                        (- (point-max) (point-min)))))
+        (vertical-motion 0 window)
+        (set-window-start window (point))))))
 
 (defun scroll-bar-drag (event)
   "Scroll the window by dragging the scroll bar slider.
diff --git a/lisp/subr.el b/lisp/subr.el
index 977d5a53f35..be06a558e5a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2196,15 +2196,15 @@ Display MESSAGE (optional fourth arg) in the echo area.
 If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there."
   (or exit-char (setq exit-char ?\s))
   (let ((ol (make-overlay pos pos))
-        (message (copy-sequence string)))
+        (str (copy-sequence string)))
     (unwind-protect
         (progn
           (save-excursion
-            (overlay-put ol 'after-string message)
+            (overlay-put ol 'after-string str)
             (goto-char pos)
             ;; To avoid trouble with out-of-bounds position
             (setq pos (point))
-            ;; If the message end is off screen, recenter now.
+            ;; If the string end is off screen, recenter now.
             (if (<= (window-end nil t) pos)
                 (recenter (/ (window-height) 2))))
           (message (or message "Type %s to continue editing.")
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 1066066462d..ae1690416b9 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -665,9 +665,8 @@ promotion/demotion later."
           (if (and (markerp marker) (marker-buffer marker))
               ;; Buffer is still live and we have the marker.
               (progn
-                (save-excursion
+                (with-current-buffer (marker-buffer marker)
                   ;; Goto the buffer and check of section is unchanged
-                  (set-buffer (marker-buffer marker))
                   (goto-char (marker-position marker))
                   (if (looking-at (regexp-quote literal))
                       ;; OK, get the makro name
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 0d8e6307d6e..d645a4c05ba 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -69,8 +69,8 @@
 ;; * revert (file &optional contents-done)         OK
 ;; - rollback (files)                              COULD BE SUPPORTED
 ;; - merge (file rev1 rev2)                   It would be possible to merge
-;;                                          changes into a single file, but when
-;;                                          committing they wouldn't
+;;                                          changes into a single file, but
+;;                                          when committing they wouldn't
 ;;                                          be identified as a merge
 ;;                                          by git, so it's probably
 ;;                                          not a good idea.
@@ -130,7 +130,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 ;;;###autoload (defun vc-git-registered (file)
 ;;;###autoload   "Return non-nil if FILE is registered with git."
-;;;###autoload   (if (vc-find-root file ".git")       ; short cut
+;;;###autoload   (if (vc-find-root file ".git")       ; Short cut.
 ;;;###autoload       (progn
 ;;;###autoload         (load "vc-git")
 ;;;###autoload         (vc-git-registered file))))
@@ -149,9 +149,11 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                (str (ignore-errors
                      (cd dir)
                      (vc-git--out-ok "ls-files" "-c" "-z" "--" name)
-                     ;; if result is empty, use ls-tree to check for deleted file
+                     ;; If result is empty, use ls-tree to check for deleted
+                     ;; file.
                      (when (eq (point-min) (point-max))
-                       (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" "--" name))
+                       (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD"
+                                       "--" name))
                      (buffer-string))))
           (and str
                (> (length str) (length name))
@@ -173,7 +175,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (if (not (vc-git-registered file))
       'unregistered
     (vc-git--call nil "add" "--refresh" "--" (file-relative-name file))
-    (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
+    (let ((diff (vc-git--run-command-string
+                 file "diff-index" "-z" "HEAD" "--")))
       (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0"
                                   diff))
           (vc-git--state-code (match-string 1 diff))
@@ -206,11 +209,12 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 (defstruct (vc-git-extra-fileinfo
             (:copier nil)
-            (:constructor vc-git-create-extra-fileinfo (old-perm new-perm &optional rename-state orig-name))
+            (:constructor vc-git-create-extra-fileinfo
+                          (old-perm new-perm &optional rename-state orig-name))
             (:conc-name vc-git-extra-fileinfo->))
-  old-perm new-perm   ;; permission flags
-  rename-state        ;; rename or copy state
-  orig-name)          ;; original name for renames or copies
+  old-perm new-perm   ;; Permission flags.
+  rename-state        ;; Rename or copy state.
+  orig-name)          ;; Original name for renames or copies.
 
 (defun vc-git-escape-file-name (name)
   "Escape a file name if necessary."
@@ -232,23 +236,23 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (let* ((old-type (lsh (or old-perm 0) -9))
          (new-type (lsh (or new-perm 0) -9))
          (str (case new-type
-                (?\100  ;; file
+                (?\100  ;; File.
                  (case old-type
                    (?\100 nil)
                    (?\120 "   (type change symlink -> file)")
                    (?\160 "   (type change subproject -> file)")))
-                 (?\120  ;; symlink
+                 (?\120  ;; Symlink.
                   (case old-type
                     (?\100 "   (type change file -> symlink)")
                     (?\160 "   (type change subproject -> symlink)")
                     (t "   (symlink)")))
-                  (?\160  ;; subproject
+                  (?\160  ;; Subproject.
                    (case old-type
                      (?\100 "   (type change file -> subproject)")
                      (?\120 "   (type change symlink -> subproject)")
                      (t "   (subproject)")))
-                  (?\110 nil)  ;; directory (internal, not a real git state)
-                  (?\000  ;; deleted or unknown
+                  (?\110 nil)  ;; Directory (internal, not a real git state).
+                  (?\000  ;; Deleted or unknown.
                    (case old-type
                      (?\120 "   (symlink)")
                      (?\160 "   (subproject)")))
@@ -258,7 +262,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
           (t ""))))
 
 (defun vc-git-rename-as-string (state extra)
-  "Return a string describing the copy or rename associated with INFO, or an empty string if none."
+  "Return a string describing the copy or rename associated with INFO,
+or an empty string if none."
   (let ((rename-state (when extra
                         (vc-git-extra-fileinfo->rename-state extra))))
     (if rename-state
@@ -267,8 +272,10 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (if (eq rename-state 'copy) "copied from "
                    (if (eq state 'added) "renamed from "
                      "renamed to "))
-                 (vc-git-escape-file-name (vc-git-extra-fileinfo->orig-name extra))
-                 ")") 'face 'font-lock-comment-face)
+                 (vc-git-escape-file-name
+                  (vc-git-extra-fileinfo->orig-name extra))
+                 ")")
+         'face 'font-lock-comment-face)
       "")))
 
 (defun vc-git-permissions-as-string (old-perm new-perm)
@@ -302,7 +309,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
      "  " (vc-git-permissions-as-string old-perm new-perm)
      "    "
      (propertize (vc-git-escape-file-name (vc-dir-fileinfo->name info))
-                 'face (if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face)
+                 'face (if isdir 'font-lock-comment-delimiter-face
+                         'font-lock-function-name-face)
                  'help-echo
                  (if isdir
                      "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
@@ -314,32 +322,39 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 (defun vc-git-after-dir-status-stage (stage files update-function)
   "Process sentinel for the various dir-status stages."
-  (let (remaining next-stage result)
+  (let (next-stage result)
     (goto-char (point-min))
     (case stage
-      ('update-index
+      (update-index
        (setq next-stage (if (vc-git--empty-db-p) 'ls-files-added
                           (if files 'ls-files-up-to-date 'diff-index))))
-      ('ls-files-added
+      (ls-files-added
        (setq next-stage 'ls-files-unknown)
        (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
          (let ((new-perm (string-to-number (match-string 1) 8))
                (name (match-string 2)))
-           (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm)) result))))
-      ('ls-files-up-to-date
+           (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm))
+                 result))))
+      (ls-files-up-to-date
        (setq next-stage 'diff-index)
        (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
          (let ((perm (string-to-number (match-string 1) 8))
                (name (match-string 2)))
-           (push (list name 'up-to-date (vc-git-create-extra-fileinfo perm perm)) result))))
-      ('ls-files-unknown
+           (push (list name 'up-to-date
+                       (vc-git-create-extra-fileinfo perm perm))
+                 result))))
+      (ls-files-unknown
        (when files (setq next-stage 'ls-files-ignored))
        (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1)
-         (push (list (match-string 1) 'unregistered (vc-git-create-extra-fileinfo 0 0)) result)))
-      ('ls-files-ignored
+         (push (list (match-string 1) 'unregistered
+                     (vc-git-create-extra-fileinfo 0 0))
+               result)))
+      (ls-files-ignored
        (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1)
-         (push (list (match-string 1) 'ignored (vc-git-create-extra-fileinfo 0 0)) result)))
-      ('diff-index
+         (push (list (match-string 1) 'ignored
+                     (vc-git-create-extra-fileinfo 0 0))
+               result)))
+      (diff-index
        (setq next-stage 'ls-files-unknown)
        (while (re-search-forward
                ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMUT]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
@@ -349,41 +364,60 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                (state (or (match-string 4) (match-string 6)))
                (name (or (match-string 5) (match-string 7)))
                (new-name (match-string 8)))
-           (if new-name  ; copy or rename
+           (if new-name  ; Copy or rename.
                (if (eq ?C (string-to-char state))
-                   (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'copy name)) result)
-                 (push (list name 'removed (vc-git-create-extra-fileinfo 0 0 'rename new-name)) result)
-                 (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'rename name)) result))
-             (push (list name (vc-git--state-code state) (vc-git-create-extra-fileinfo old-perm new-perm)) result))))))
+                   (push (list new-name 'added
+                               (vc-git-create-extra-fileinfo old-perm new-perm
+                                                             'copy name))
+                         result)
+                 (push (list name 'removed
+                             (vc-git-create-extra-fileinfo 0 0
+                                                           'rename new-name))
+                       result)
+                 (push (list new-name 'added
+                             (vc-git-create-extra-fileinfo old-perm new-perm
+                                                           'rename name))
+                       result))
+             (push (list name (vc-git--state-code state)
+                         (vc-git-create-extra-fileinfo old-perm new-perm))
+                   result))))))
     (when result
       (setq result (nreverse result))
       (when files
         (dolist (entry result) (setq files (delete (car entry) files)))
         (unless files (setq next-stage nil))))
-    (when (or result (not next-stage)) (funcall update-function result next-stage))
-    (when next-stage (vc-git-dir-status-goto-stage next-stage files update-function))))
+    (when (or result (not next-stage))
+      (funcall update-function result next-stage))
+    (when next-stage
+      (vc-git-dir-status-goto-stage next-stage files update-function))))
 
 (defun vc-git-dir-status-goto-stage (stage files update-function)
   (erase-buffer)
   (case stage
-    ('update-index
+    (update-index
      (if files
          (vc-git-command (current-buffer) 'async files "add" "--refresh" "--")
-       (vc-git-command (current-buffer) 'async nil "update-index" "--refresh")))
-    ('ls-files-added
-     (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-c" "-s" "--"))
-    ('ls-files-up-to-date
-     (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-c" "-s" "--"))
-    ('ls-files-unknown
-     (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o"
-                     "--directory" "--no-empty-directory" "--exclude-standard" "--"))
-    ('ls-files-ignored
-     (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i"
-                     "--directory" "--no-empty-directory" "--exclude-standard" "--"))
-    ('diff-index
-     (vc-git-command (current-buffer) 'async files "diff-index" "--relative" "-z" "-M" "HEAD" "--")))
+       (vc-git-command (current-buffer) 'async nil
+                       "update-index" "--refresh")))
+    (ls-files-added
+     (vc-git-command (current-buffer) 'async files
+                     "ls-files" "-z" "-c" "-s" "--"))
+    (ls-files-up-to-date
+     (vc-git-command (current-buffer) 'async files
+                     "ls-files" "-z" "-c" "-s" "--"))
+    (ls-files-unknown
+     (vc-git-command (current-buffer) 'async files
+                     "ls-files" "-z" "-o" "--directory"
+                     "--no-empty-directory" "--exclude-standard" "--"))
+    (ls-files-ignored
+     (vc-git-command (current-buffer) 'async files
+                     "ls-files" "-z" "-o" "-i" "--directory"
+                     "--no-empty-directory" "--exclude-standard" "--"))
+    (diff-index
+     (vc-git-command (current-buffer) 'async files
+                     "diff-index" "--relative" "-z" "-M" "HEAD" "--")))
   (vc-exec-after
-   `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function))))
+   `(vc-git-after-dir-status-stage ',stage  ',files ',update-function)))
 
 (defun vc-git-dir-status (dir update-function)
   "Return a list of (FILE STATE EXTRA) entries for DIR."
@@ -439,14 +473,16 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
           (setq remote
                 (with-output-to-string
                   (with-current-buffer standard-output
-                    (vc-git--out-ok "config" (concat "branch." branch ".remote")))))
+                    (vc-git--out-ok "config"
+                                    (concat "branch." branch ".remote")))))
           (when (string-match "\\([^\n]+\\)" remote)
             (setq remote (match-string 1 remote)))
           (when remote
             (setq remote-url
                   (with-output-to-string
                     (with-current-buffer standard-output
-                      (vc-git--out-ok "config" (concat "remote." remote ".url"))))))
+                      (vc-git--out-ok "config"
+                                      (concat "remote." remote ".url"))))))
           (when (string-match "\\([^\n]+\\)" remote-url)
             (setq remote-url (match-string 1 remote-url))))
       (setq branch "not (detached HEAD)"))
@@ -550,8 +586,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                (append
                 '("log" "--no-color")
                 (when shortlog
-                  '("--graph" "--decorate"
-                    "--date=short" "--pretty=format:%d%h  %ad  %s" "--abbrev-commit"))
+                  '("--graph" "--decorate" "--date=short"
+                    "--pretty=format:%d%h  %ad  %s" "--abbrev-commit"))
                 (when limit (list "-n" (format "%s" limit)))
                 (when start-revision (list start-revision))
                 '("--")))))))
@@ -565,7 +601,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 (defvar vc-short-log)
 
 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
-  (require 'add-log) ;; we need the faces add-log
+  (require 'add-log) ;; We need the faces add-log.
   ;; Don't have file markers, so use impossible regexp.
   (set (make-local-variable 'log-view-file-re) "\\`a\\`")
   (set (make-local-variable 'log-view-per-file-logs) nil)
@@ -610,17 +646,16 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 REVISION may have the form BRANCH, BRANCH~N,
 or BRANCH^ (where \"^\" can be repeated)."
   (goto-char (point-min))
-  (let (found)
-    (when revision
-      (setq found
-            (search-forward (format "\ncommit %s" revision) nil t
-                            (cond ((string-match "~\\([0-9]\\)$" revision)
-                                   (1+ (string-to-number (match-string 1 revision))))
-                                  ((string-match "\\^+$" revision)
-                                   (1+ (length (match-string 0 revision))))
-                                  (t nil)))))
-    (beginning-of-line)
-    found))
+  (prog1
+      (when revision
+        (search-forward
+         (format "\ncommit %s" revision) nil t
+         (cond ((string-match "~\\([0-9]\\)\\'" revision)
+                (1+ (string-to-number (match-string 1 revision))))
+               ((string-match "\\^+\\'" revision)
+                (1+ (length (match-string 0 revision))))
+               (t nil))))
+    (beginning-of-line)))
 
 (defun vc-git-diff (files &optional rev1 rev2 buffer)
   "Get a difference report using Git between two revisions of FILES."
@@ -948,7 +983,8 @@ Returns nil if not possible."
                       (goto-char (point-min))
                       (= (forward-line 2) 1)
                       (bolp)
-                      (buffer-substring-no-properties (point-min) (1- (point-max)))))))
+                      (buffer-substring-no-properties (point-min)
+                                                      (1- (point-max)))))))
          (and name (not (string= name "undefined")) name))))
 
 (provide 'vc-git)