upstream

5 files changed, 48 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a0c33da3c8..93ae0f12862 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more
+        than 197 variables.
+
+2012-03-26  Ami Fischman  <ami@fischman.org>
+
+        * vc/vc-git.el (vc-git-state): Avoid unnecessarily locking.
+
+2012-03-26  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (save-buffers-kill-emacs): Doc fix.
+
+        * startup.el (normal-top-level, command-line, command-line-1):
+        Give them doc strings.
+
 2012-03-25  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2ee878e5213..93c6518d215 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2694,7 +2694,8 @@ If FORM is a lambda or a macro, byte-compile it as a function."
          (limits '(5                    ; Use the 1-byte varref codes,
                    63  ; 1-constlim     ;  1-byte byte-constant codes,
                    255                  ;  2-byte varref codes,
-                   65535))              ;  3-byte codes for the rest.
+                   65535                ;  3-byte codes for the rest.
+                   65535))              ;  twice since we step when we swap.
          limit)
     (while (or rest other)
       (setq limit (car limits))
@@ -2708,8 +2709,8 @@ If FORM is a lambda or a macro, byte-compile it as a function."
           (setcdr (car rest) (setq i (1+ i)))
           (setq ret (cons (car rest) ret))))
         (setq rest (cdr rest)))
-      (setq limits (cdr limits)
-            rest (prog1 other
+      (setq limits (cdr limits)         ;Step
+            rest (prog1 other           ;&Swap.
                    (setq other rest))))
     (apply 'vector (nreverse (mapcar 'car ret)))))
 
diff --git a/lisp/files.el b/lisp/files.el
index 8c61c288be9..b3fc0766ac5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6290,7 +6290,11 @@ be a predicate function such as `yes-or-no-p'."
 
 (defun save-buffers-kill-emacs (&optional arg)
   "Offer to save each buffer, then kill this Emacs process.
-With prefix ARG, silently save all file-visiting buffers, then kill."
+With prefix ARG, silently save all file-visiting buffers without asking.
+If there are active processes where `process-query-on-exit-flag'
+returns non-nil, asks whether processes should be killed.
+Runs the members of `kill-emacs-query-functions' in turn and stops
+if any returns nil.  If `confirm-kill-emacs' is non-nil, calls it."
   (interactive "P")
   (save-some-buffers arg t)
   (and (or (not (memq t (mapcar (function
diff --git a/lisp/startup.el b/lisp/startup.el
index 41056f3907e..57d7a74e5ec 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -65,6 +65,8 @@ once you are familiar with the contents of the startup screen."
 
 (defvar startup-screen-inhibit-startup-screen nil)
 
+;; FIXME? Why does this get such weirdly extreme treatment, when the
+;; more important inhibit-startup-screen does not.
 (defcustom inhibit-startup-echo-area-message nil
   "Non-nil inhibits the initial startup echo area message.
 Setting this variable takes effect
@@ -464,6 +466,10 @@ DIRS are relative."
       (setcdr tail (append (mapcar 'expand-file-name dirs) (cdr tail))))))
 
 (defun normal-top-level ()
+  "Emacs calls this function when it first starts up.
+It sets `command-line-processed', processes the command-line,
+reads the initialization files, etc.
+It is the default value of the variable `top-level'."
   (if command-line-processed
       (message "Back to top level.")
     (setq command-line-processed t)
@@ -701,6 +707,8 @@ opening the first frame (e.g. open a connection to an X server).")
 (defvar server-process)
 
 (defun command-line ()
+  "A subroutine of `normal-top-level'.
+Amongst another things, it parses the command-line arguments."
   (setq before-init-time (current-time)
         after-init-time nil
         command-line-default-directory default-directory)
@@ -2076,6 +2084,7 @@ A fancy display is used on graphic displays, normal otherwise."
 (defalias 'display-splash-screen 'display-startup-screen)
 
 (defun command-line-1 (args-left)
+  "A subroutine of `command-line'."
   (display-startup-echo-area-message)
   (when (and pure-space-overflow
              (not noninteractive))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 3ec32243796..bf7b7fb9e17 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -217,12 +217,21 @@ matching the resulting Git log output, and KEYWORDS is a list of
   ;; operation.
   (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" "--")))
-      (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))
+                 file "diff-index" "-p" "--raw" "-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\\(\\(?:.\\|\n\\)*\\)\\'"
+                             diff))
+          (let ((diff-letter (match-string 1 diff))
+                (diff-contents (match-string 2 diff)))
+            (if (not (string-match "\n." diff-contents))
+                ;; Empty diff: file contents is the same as the HEAD
+                ;; revision, but timestamps are different (eg, file
+                ;; was "touch"ed).  Update timestamp in index:
+                (prog1 'up-to-date
+                  (vc-git--call nil "add" "--refresh" "--"
+                                (file-relative-name file)))
+              (vc-git--state-code diff-letter)))
         (if (vc-git--empty-db-p) 'added 'up-to-date)))))
 
 (defun vc-git-working-revision (file)