Merge from emacs-24

3 files changed, 11 insertions, 5 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 73c4ed2eb4d..9fc7ce3e33d 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -95,7 +95,6 @@ EMACS_CONFIGURATION
 EMACS_CONFIG_OPTIONS
 EMACS_INT
 EMACS_UINT
-FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
 GC_LISP_OBJECT_ALIGNMENT
 GC_MARK_SECONDARY_STACK
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1aa086cd52e..0d059714788 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * CPP-DEFINES: Remove FILE_SYSTEM_CASE.
+
+2012-07-17  Chong Yidong  <cyd@gnu.org>
+
+        * Version 24.1 released.
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume mkdir, perror, rename, rmdir, strerror.
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 4f5cee14737..977e95860e2 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -138,17 +138,17 @@ Type `y' to skip this revision,
 `N' to include it and go on to the next revision,
 `n' to not skip, but continue to search this log entry for skip regexps,
 `q' to quit merging."))
-                    (case (save-excursion
+                    (pcase (save-excursion
                             (read-char-choice
                              (format "%s: Skip (y/n/N/q/%s)? " str
                                      (key-description (vector help-char)))
                              '(?y ?n ?N ?q)))
-                      (?y (setq skip t))
-                      (?q (keyboard-quit))
+                      (`?y (setq skip t))
+                      (`?q (keyboard-quit))
                       ;; A single log entry can match skip-regexp multiple
                       ;; times.  If you are sure you don't want to skip it,
                       ;; you don't want to be asked multiple times.
-                      (?N (setq skip 'no))))))
+                      (`?N (setq skip 'no))))))
               (if (eq skip t)
                   (push revno skipped)
                 (push revno revnos)))))