[Emacs-diffs] /srv/bzr/emacs/trunk r108893: Merge from emacs-24; up to r108065

[Chong Yidong]

------------------------------------------------------------
revno: 108893 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-06 12:33:03 +0800
message:
  Merge from emacs-24; up to r108065
modified:
  doc/emacs/ChangeLog
  doc/emacs/basic.texi
  doc/emacs/maintaining.texi
  lisp/ChangeLog
  lisp/files.el
  lisp/simple.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-06-29 06:28:37 +0000
+++ b/doc/emacs/ChangeLog       2012-07-06 04:31:46 +0000
@@ -1,3 +1,8 @@
+2012-06-29  Chong Yidong  <address@hidden>
+
+       * maintaining.texi (Basic VC Editing, VC Pull, Merging):
+       * basic.texi (Erasing, Basic Undo): Fix markup.
+
 2012-06-29  Glenn Morris  <address@hidden>
 
        * fixit.texi (Undo): Grammar fixes.  (Bug#11779)

=== modified file 'doc/emacs/basic.texi'
--- a/doc/emacs/basic.texi      2012-05-27 01:25:06 +0000
+++ b/doc/emacs/basic.texi      2012-07-06 04:31:46 +0000
@@ -345,7 +345,7 @@
 Delete the character before point, or the region if it is active
 (@code{delete-backward-char}).
 
address@hidden @key{Delete}
address@hidden @key{Delete}
 Delete the character after point, or the region if it is active
 (@code{delete-forward-char}).
 
@@ -403,7 +403,8 @@
 @item C-/
 Undo one entry of the undo records---usually, one command worth
 (@code{undo}).
address@hidden C-x u
+
address@hidden C-x u
 @itemx C-_
 The same.
 @end table

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2012-06-17 05:13:40 +0000
+++ b/doc/emacs/maintaining.texi        2012-07-06 04:31:46 +0000
@@ -426,7 +426,7 @@
 one revision for each changed file.
 
 @table @kbd
address@hidden C-x v v
address@hidden C-x v v
 Perform the next appropriate version control operation on the current
 VC fileset.
 @end table
@@ -1326,7 +1326,7 @@
 @subsubsection Pulling Changes into a Branch
 
 @table @kbd
address@hidden C-x v +
address@hidden C-x v +
 On a decentralized version control system, update the current branch
 by ``pulling in'' changes from another location.
 
@@ -1366,7 +1366,7 @@
 @cindex merging changes
 
 @table @kbd
address@hidden C-x v m
address@hidden C-x v m
 On a decentralized version control system, merge changes from another
 branch into the current one.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-06 01:31:54 +0000
+++ b/lisp/ChangeLog    2012-07-06 04:31:46 +0000
@@ -1,5 +1,21 @@
 2012-07-06  Glenn Morris  <address@hidden>
 
+       * simple.el (kill-whole-line): Doc tweak.
+
+2012-07-06  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * calendar/cal-dst.el (calendar-current-time-zone): Return
+       calendar-current-time-zone-cache if non-nil.
+
+2012-07-06  Glenn Morris  <address@hidden>
+
        * Makefile.in (cvs-update): Remove old alias.
 
 2012-07-05  Michael Albinus  <address@hidden>

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-07-04 15:59:12 +0000
+++ b/lisp/files.el     2012-07-06 04:31:46 +0000
@@ -4332,7 +4332,9 @@
                                                        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 @@
            (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 @@
           (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))))

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-06-28 07:21:41 +0000
+++ b/lisp/simple.el    2012-07-06 04:31:46 +0000
@@ -3541,7 +3541,7 @@
 ;; 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)