Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 117bbfc21c88c8ad75fce350bfe5f13d813e8de2..5cd49a9d692581e0ac5896178b9a35c2c9236c22 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-29  Chong Yidong  <cyd@gnu.org>
+
+       * maintaining.texi (Basic VC Editing, VC Pull, Merging):
+       * basic.texi (Erasing, Basic Undo): Fix markup.
+
 2012-06-29  Glenn Morris  <rgm@gnu.org>
 
        * fixit.texi (Undo): Grammar fixes.  (Bug#11779)

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index bbcd1d62a8b5b7bea518a41011650797c18880fc..9c4b303d2826cdb7e4637b43d1bd8ff2a83348bf 100644 (file)
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -345,7 +345,7 @@ moves down into it.
 Delete the character before point, or the region if it is active
 (@code{delete-backward-char}).
 
-@itemx @key{Delete}
+@item @key{Delete}
 Delete the character after point, or the region if it is active
 (@code{delete-forward-char}).
 
@@ -403,7 +403,8 @@ commands.
 @item C-/
 Undo one entry of the undo records---usually, one command worth
 (@code{undo}).
-@itemx C-x u
+
+@item C-x u
 @itemx C-_
 The same.
 @end table

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index da3781878735d1b310b4992c8bf4c6b0bdc739e3..c719c483ec825386ddd0ab108b9fcbb5630dfff6 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -426,7 +426,7 @@ VC fileset is handled individually; for example, a commit generates
 one revision for each changed file.
 
 @table @kbd
-@itemx C-x v v
+@item C-x v v
 Perform the next appropriate version control operation on the current
 VC fileset.
 @end table
@@ -1326,7 +1326,7 @@ commit will be committed to that specific branch.
 @subsubsection Pulling Changes into a Branch
 
 @table @kbd
-@itemx C-x v +
+@item C-x v +
 On a decentralized version control system, update the current branch
 by ``pulling in'' changes from another location.
 
@@ -1366,7 +1366,7 @@ updates the current VC fileset from the repository.
 @cindex merging changes
 
 @table @kbd
-@itemx C-x v m
+@item C-x v m
 On a decentralized version control system, merge changes from another
 branch into the current one.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3aa2953328a953a6d6a135473c186316e241d26..a745669d75405a1c65c186ccf37cce6e3edd25e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2012-07-06  Glenn Morris  <rgm@gnu.org>
+
+       * simple.el (kill-whole-line): Doc tweak.
+
+2012-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.el (file-relative-name): Compare file names
+       case-insensitively if on MS-Windows or MS-DOS, or if
+       read-file-name-completion-ignore-case is non-nil.  Don't use
+       case-fold-search for this purpose.  (Bug#11827)
+
+2012-07-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * calendar/cal-dst.el (calendar-current-time-zone): Return
+       calendar-current-time-zone-cache if non-nil.
+
 2012-07-06  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (cvs-update): Remove old alias.

diff --git a/lisp/files.el b/lisp/files.el
index 34144f494cf71b66e432ae50e9d4ef7207c75b50..b17b2ffbd2a89315ef7ffe929dd44c3b42a005e5 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4332,7 +4332,9 @@ on a DOS/Windows machine, it returns FILENAME in expanded form."
                                                        default-directory))))
     (setq filename (expand-file-name filename))
     (let ((fremote (file-remote-p filename))
-          (dremote (file-remote-p directory)))
+         (dremote (file-remote-p directory))
+         (fold-case (or (memq system-type '(ms-dos cygwin windows-nt))
+                        read-file-name-completion-ignore-case)))
       (if ;; Conditions for separate trees
          (or
           ;; Test for different filesystems on DOS/Windows
@@ -4341,7 +4343,7 @@ on a DOS/Windows machine, it returns FILENAME in expanded form."
            (memq system-type '(ms-dos cygwin windows-nt))
            (or
             ;; Test for different drive letters
-            (not (eq t (compare-strings filename 0 2 directory 0 2)))
+            (not (eq t (compare-strings filename 0 2 directory 0 2 fold-case)))
             ;; Test for UNCs on different servers
             (not (eq t (compare-strings
                         (progn
@@ -4366,16 +4368,16 @@ on a DOS/Windows machine, it returns FILENAME in expanded form."
           (while (not
                  (or
                   (eq t (compare-strings filename-dir nil (length directory)
-                                         directory nil nil case-fold-search))
+                                         directory nil nil fold-case))
                   (eq t (compare-strings filename nil (length directory)
-                                         directory nil nil case-fold-search))))
+                                         directory nil nil fold-case))))
             (setq directory (file-name-directory (substring directory 0 -1))
                  ancestor (if (equal ancestor ".")
                               ".."
                             (concat "../" ancestor))))
           ;; Now ancestor is empty, or .., or ../.., etc.
           (if (eq t (compare-strings filename nil (length directory)
-                                    directory nil nil case-fold-search))
+                                    directory nil nil fold-case))
              ;; We matched within FILENAME's directory part.
              ;; Add the rest of FILENAME onto ANCESTOR.
              (let ((rest (substring filename (length directory))))

diff --git a/lisp/simple.el b/lisp/simple.el
index 1b347794521f7da0d012024ff19644877d8efae3..560616aa7c7702c114e20e86b3750f9550741f85 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3541,7 +3541,7 @@ Goes backward if ARG is negative; error if CHAR not found."
 ;; kill-line and its subroutines.
 
 (defcustom kill-whole-line nil
-  "If non-nil, `kill-line' with no arg at beg of line kills the whole line."
+  "If non-nil, `kill-line' with no arg at start of line kills the whole line."
   :type 'boolean
   :group 'killing)