merge trunk

30 files changed, 75 insertions, 50 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4da85943b7f..2178df6caf0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+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
+        updated and checked.
+
 2011-11-26  Andreas Schwab  <schwab@linux-m68k.org>
 
         * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
@@ -1226,7 +1236,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 65f98c85496..6b10d51b970 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -99,7 +99,7 @@ names of the people who have checked it.
 
 SECTION                  READERS
 ----------------------------------
-TUTORIAL             
+TUTORIAL             cyd
 TUTORIAL.bg          
 TUTORIAL.cn
 TUTORIAL.cs          
@@ -107,7 +107,7 @@ TUTORIAL.de
 TUTORIAL.eo
 TUTORIAL.es          
 TUTORIAL.fr          
-TUTORIAL.he
+TUTORIAL.he          eliz
 TUTORIAL.it          
 TUTORIAL.ja              
 TUTORIAL.ko
@@ -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
@@ -133,9 +133,9 @@ buffers.texi      cyd
 building.texi     cyd
 calendar.texi     
 cal-xtra.texi     
-cmdargs.texi      
+cmdargs.texi      cyd
 commands.texi     cyd
-custom.texi       
+custom.texi       cyd
 dired.texi        cyd
 dired-xtra.texi
 display.texi      cyd
@@ -144,7 +144,7 @@ emacs-xtra.texi
 emerge-xtra.texi
 entering.texi     cyd
 files.texi        cyd
-fixit.texi        
+fixit.texi        cyd
 fortran-xtra.texi 
 frames.texi       cyd
 glossary.texi
@@ -154,28 +154,28 @@ killing.texi      cyd
 kmacro.texi       cyd
 macos.texi        
 maintaining.texi  cyd
-major.texi        
 mark.texi         cyd
 mini.texi         
-misc.texi         
+misc.texi         cyd
 modes.texi        cyd
 msdog.texi        
 msdog-xtra.texi   
 mule.texi         
 m-x.texi          cyd
+package.texi      cyd
 picture-xtra.texi
 programs.texi     cyd
 regs.texi         cyd
 rmail.texi        
 screen.texi       cyd
 search.texi       cyd
-sending.texi      
+sending.texi      cyd
 text.texi         cyd
-trouble.texi      
+trouble.texi      cyd
 vc-xtra.texi      cyd
 vc1-xtra.texi     cyd
 windows.texi      cyd
-xresources.texi   
+xresources.texi   cyd
 
 ** Check the Lisp manual.
 
@@ -203,7 +203,7 @@ help.texi
 hooks.texi        
 index.texi
 internals.texi    
-intro.texi        
+intro.texi        cyd
 keymaps.texi      
 lists.texi        
 loading.texi      
diff --git a/admin/README b/admin/README
index 10a8f2244fc..b5eefc2da7a 100644
--- a/admin/README
+++ b/admin/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/admin.el b/admin/admin.el
index 9235144f6c6..2ca838fdff9 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index b3ea8af9d70..2ad5acadcb0 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
 
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/admin/build-configs b/admin/build-configs
index 79ba58aeec0..59a3a1bbbca 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 # Build Emacs in several different configurations.
 
-# Copyright (C) 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 583f0d88866..cb63d5b16ba 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,6 +1,6 @@
 ;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
-;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: 
@@ -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/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index e87d548cf31..b43611db11d 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -1,4 +1,4 @@
-Copyright (C) 2009-2011 Free Software Foundation, Inc.
+Copyright (C) 2009-2012 Free Software Foundation, Inc.
 Copyright (C) 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
diff --git a/admin/cus-test.el b/admin/cus-test.el
index b254fedccc4..11d781ed01e 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002-2012  Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 59ae1a6f26c..1dbf9a12399 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el
index a7fe955acf4..efe4db039c4 100644
--- a/admin/grammars/bovine-grammar.el
+++ b/admin/grammars/bovine-grammar.el
@@ -1,6 +1,6 @@
 ;;; bovine-grammar.el --- Bovine's input grammar mode
 ;;
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index b49f8ce76c7..1bdaf8f447b 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -1,6 +1,6 @@
 ;;; c.by -- LL grammar for C/C++ language specification
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
@@ -261,7 +261,7 @@ define
   ;
 
 ;; In C++, structures can have the same things as classes.
-;; So delete this somday in the figure.
+;; So delete this some day in the figure.
 ;;
 ;;structparts : semantic-list
 ;;            (EXPANDFULL $1 structsubparts)
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index 18e8b814303..1189d6b0886 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -1,6 +1,6 @@
 ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
 ;;
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index f4b2f1f1f49..b58b96c6bfb 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -1,6 +1,6 @@
 ;;; java-tags.wy -- Semantic LALR grammar for Java
 
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index ffa324806cf..c6b3a58aac3 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -1,6 +1,6 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
-;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
diff --git a/admin/grammars/make.by b/admin/grammars/make.by
index dab4472b737..ee933805cf6 100644
--- a/admin/grammars/make.by
+++ b/admin/grammars/make.by
@@ -1,6 +1,6 @@
 ;;; make.by -- BY notation for Makefiles.
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index b30305ee78a..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-2011 Free Software Foundation, Inc.
-;; Copyright (C) 2001-2010 Python Software Foundation
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
+;; 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/scheme.by b/admin/grammars/scheme.by
index bc6612d4c70..3925f03c28b 100644
--- a/admin/grammars/scheme.by
+++ b/admin/grammars/scheme.by
@@ -1,6 +1,6 @@
 ;;; scheme.by -- Scheme BNF language specification
 
-;; Copyright (C) 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index 4ff2d7e4e41..f38d7eaa2a1 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -1,6 +1,6 @@
 ;;; srecode-template.wy --- Semantic Recoder Template parser
 
-;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/admin/grammars/wisent-grammar.el b/admin/grammars/wisent-grammar.el
index 66045c2294d..714b5211127 100644
--- a/admin/grammars/wisent-grammar.el
+++ b/admin/grammars/wisent-grammar.el
@@ -1,6 +1,6 @@
 ;;; wisent-grammar.el --- Wisent's input grammar mode
 
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -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 ()
diff --git a/admin/make-announcement b/admin/make-announcement
index dcfd55e8375..5b45d09e89b 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-## Copyright (C) 2002-2011  Free Software Foundation, Inc.
+## Copyright (C) 2002-2012  Free Software Foundation, Inc.
 
 ## Author: Francesco Potorti` <pot@gnu.org>
 
diff --git a/admin/make-emacs b/admin/make-emacs
index d231f66b03b..f64d51b0c41 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -2,7 +2,7 @@
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
 
-# Copyright (C) 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 0ad99900779..72b7d7e2d23 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2011  Free Software Foundation, Inc.
+Copyright (C) 2007-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index d51d3ec1c3b..ec2dc11345b 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -1,4 +1,4 @@
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO
index c03d0f6fdfb..065a10f20e4 100644
--- a/admin/notes/lel-TODO
+++ b/admin/notes/lel-TODO
@@ -1,6 +1,6 @@
 Some lisp/emacs-lisp/ Features and Where They Are Documented
 
-Copyright (C) 2007-2011 Free Software Foundation, Inc.
+Copyright (C) 2007-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 8a10997eb8b..4146c8ffa58 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007-2011  Free Software Foundation, Inc.
+Copyright (C) 2007-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
@@ -789,7 +789,7 @@ DIARY OF CHANGES
    frame's kboard from there.)
 
 -- Fix rif issue with X-tty combo sessions.  IMHO the best thing to do
-   is to get rid of that global variable (and use the value value in
+   is to get rid of that global variable (and use the value in
    display_method, which is guaranteed to be correct).
 
    (Done, did exactly that.  Core dumps during combo sessions became
diff --git a/admin/notes/unicode b/admin/notes/unicode
index ce7d3732f03..382e3ee0f9f 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,6 +1,6 @@
                                             -*-mode: text; coding: latin-1;-*-
 
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Problems, fixmes and other unicode-related issues
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index 8c7d1510a05..d3dd88a99ec 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                            Emacs for Windows
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index c320bbe915d..1b0c9390889 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                       Precompiled Distributions of
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 841a895248e..06cd2d40901 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001-2011  Free Software Foundation, Inc.
+## Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -49,7 +49,7 @@ COPY='cp -f'
 REMOVE='rm -r'
 MKDIR='mkdir -p'
 
-# Used to execute commands once once we create them
+# Used to execute commands once we create them
 EXEC='sh'
 
 NAWK=/usr/bin/nawk