upstream

5 files changed, 40 insertions, 21 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 597beb60ce2..2178df6caf0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-19  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the
+        "skip?" question, since there can be multiple such for any revision.
+
 2012-01-14  Eli Zaretskii  <eliz@gnu.org>
 
         * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index daf8e33d041..f704a3c9397 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -100,10 +100,10 @@ names of the people who have checked it.
 SECTION                  READERS
 ----------------------------------
 TUTORIAL             cyd
-TUTORIAL.bg          
+TUTORIAL.bg          ogi
 TUTORIAL.cn
 TUTORIAL.cs          
-TUTORIAL.de          
+TUTORIAL.de          wl
 TUTORIAL.eo
 TUTORIAL.es          
 TUTORIAL.fr          
@@ -117,7 +117,7 @@ TUTORIAL.pt_BR
 TUTORIAL.ro
 TUTORIAL.ru          
 TUTORIAL.sk          
-TUTORIAL.sl          
+TUTORIAL.sl          Primoz PETERLIN
 TUTORIAL.sv          
 TUTORIAL.th          
 TUTORIAL.zh
@@ -187,25 +187,25 @@ backups.texi
 buffers.texi      
 commands.texi     
 compile.texi      
-control.texi      
+control.texi      cyd
 customize.texi    
 debugging.texi    
 display.texi      
 edebug.texi
 elisp.texi
 errors.texi       
-eval.texi         
+eval.texi         cyd
 files.texi        
 frames.texi       
 functions.texi    
-hash.texi         
+hash.texi         cyd
 help.texi         
 hooks.texi        
 index.texi
 internals.texi    
-intro.texi        
+intro.texi        cyd
 keymaps.texi      
-lists.texi        
+lists.texi        cyd
 loading.texi      
 locals.texi       
 macros.texi       
@@ -214,17 +214,17 @@ markers.texi
 minibuf.texi      
 modes.texi        
 nonascii.texi     
-numbers.texi      
-objects.texi      
+numbers.texi      cyd
+objects.texi      cyd
 os.texi           
 package.texi
 positions.texi    
 processes.texi
 searching.texi    
-sequences.texi    
+sequences.texi    cyd
 streams.texi      
-strings.texi      
-symbols.texi      
+strings.texi      cyd
+symbols.texi      cyd
 syntax.texi       
 text.texi         
 tips.texi         
@@ -232,8 +232,7 @@ variables.texi
 windows.texi      
 
 * PLANNED ADDITIONS
-
-** pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray).
+* pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray).
 ** gas-mode ?
 
 
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 2efb17603cd..cb63d5b16ba 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -133,9 +133,23 @@ are both lists of revnos, in oldest-first order."
                     (setq str (substring str (match-end 0))))
                   (when (string-match "[.!;, ]+\\'" str)
                     (setq str (substring str 0 (match-beginning 0))))
-                  (if (save-excursion (y-or-n-p (concat str ": Skip? ")))
-                      (setq skip t))))
-              (if skip
+                  (let ((help-form "\
+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
+                            (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))
+                      ;; 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))))))
+              (if (eq skip t)
                   (push revno skipped)
                 (push revno revnos)))))
         (delete-region (point) (point-max)))
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 65f317145a0..f7808fd20b8 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -1,7 +1,8 @@
 ;;; python.wy -- LALR grammar for Python
 
 ;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
-;; Copyright (C) 2001-2010 Python Software Foundation
+;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
 ;; Author: Richard Kim <ryk@dspwiz.com>
 ;; Maintainer: Richard Kim <ryk@dspwiz.com>
diff --git a/admin/grammars/wisent-grammar.el b/admin/grammars/wisent-grammar.el
index be014a56906..714b5211127 100644
--- a/admin/grammars/wisent-grammar.el
+++ b/admin/grammars/wisent-grammar.el
@@ -470,13 +470,13 @@ Menu items are appended to the common grammar menu.")
      "srecode/srt-wy")
     ("wisent-javascript-jv-wy.el"
      "semantic/wisent/js-wy"
-     "Copyright (C) 1998-2011 Ecma International"
+     "Copyright (C) 1998-2011 Ecma International."
      ,wisent-make-parsers--ecmascript-license)
     ("wisent-java-tags-wy.el"
      "semantic/wisent/javat-wy")
     ("wisent-python-wy.el"
      "semantic/wisent/python-wy"
-     "Copyright (C) 2001-2010 Python Software Foundation"
+     "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation; All Rights Reserved."
      ,wisent-make-parsers--python-license)))
 
 (defun wisent-make-parsers ()