From 49f70d46ea38ceb7a501594db7f6ea35e19681aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jan 2012 23:52:35 -0800 Subject: Add 2012 to FSF copyright years for Emacs files (do not merge to trunk) --- admin/ChangeLog | 2 +- admin/README | 2 +- admin/admin.el | 2 +- admin/alloc-colors.c | 2 +- admin/build-configs | 2 +- admin/charsets/mapfiles/README | 2 +- admin/cus-test.el | 2 +- admin/diff-tar-files | 2 +- admin/make-announcement | 2 +- admin/make-emacs | 2 +- admin/notes/copyright | 2 +- admin/notes/font-backend | 2 +- admin/notes/lel-TODO | 2 +- admin/notes/multi-tty | 2 +- admin/notes/unicode | 2 +- admin/nt/README-UNDUMP.W32 | 2 +- admin/nt/README-ftp-server | 2 +- admin/nt/README.W32 | 2 +- admin/nt/makedist.bat | 2 +- admin/quick-install-emacs | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) (limited to 'admin') diff --git a/admin/ChangeLog b/admin/ChangeLog index 39a8a8f57d5..1ff29e58254 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -877,7 +877,7 @@ ;; End: Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index 17232f5f3a5..3f85d475d7c 100644 --- a/admin/README +++ b/admin/README @@ -1,5 +1,5 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 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 b792287596b..31dc74891ed 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,7 +1,7 @@ ;;; admin.el --- utilities for Emacs administration ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -;; 2010, 2011 Free Software Foundation, Inc. +;; 2010, 2011, 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 38312604248..784e4c17dd9 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -1,5 +1,5 @@ /* Allocate X colors. Used for testing with dense colormaps. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/build-configs b/admin/build-configs index 759750f8475..5679bce2d1a 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index a47c5d7b733..62e768fa4d6 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,4 +1,4 @@ -Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2009, 2010, 2011, 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 060e100f6c4..0b921f24783 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, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; Author: Markus Rost diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 92198bad892..3be05de01c3 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/make-announcement b/admin/make-announcement index 180c35601b3..41fe5dc99b6 100755 --- a/admin/make-announcement +++ b/admin/make-announcement @@ -1,7 +1,7 @@ #! /bin/bash ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010, 2011 Free Software Foundation, Inc. +## 2010, 2011, 2012 Free Software Foundation, Inc. ## Author: Francesco Potorti` diff --git a/admin/make-emacs b/admin/make-emacs index 9abfa731be5..03876fff568 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/notes/copyright b/admin/notes/copyright index 81736e038b6..5d0a77b5c43 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 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 d35102d681e..3b7f35314d9 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 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 f38f9641c58..60600e4a936 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, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 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 1dfc56f7a10..9db2c696b53 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. diff --git a/admin/notes/unicode b/admin/notes/unicode index 2ef9baf11b1..e453de698f1 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: latin-1;-*- -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index e5dad487e13..f98732720cb 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index eab757148d8..24806591be8 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README.W32 b/admin/nt/README.W32 index 600e2c31d12..efc6aca7485 100644 --- a/admin/nt/README.W32 +++ b/admin/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat index 31361e53e5e..68b2b1f5b14 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat @@ -1,6 +1,6 @@ @echo off -rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 rem Free Software Foundation, Inc. rem Cannot use brackets in andrewi's email below because diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 1ad9c28aae2..1736b9c24df 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ## Free Software Foundation, Inc. ## Author: Miles Bader -- cgit v1.2.1 From 6d0bd9ba728ea8714baf9eef1dc9ec34000e2e96 Mon Sep 17 00:00:00 2001 From: Primoz PETERLIN Date: Tue, 17 Jan 2012 22:16:42 +0800 Subject: Update Slovenian tutorial. --- admin/FOR-RELEASE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'admin') diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index daf8e33d041..6b10d51b970 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -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 @@ -203,7 +203,7 @@ help.texi hooks.texi index.texi internals.texi -intro.texi +intro.texi cyd keymaps.texi lists.texi loading.texi -- cgit v1.2.1 From 54de86ac6216fc2eece477308dde090381d6b6c7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Jan 2012 22:42:57 -0800 Subject: Small bzrmerge.el change. * admin/bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the "skip?" question, since there can be multiple such for any revision. --- admin/ChangeLog | 5 +++++ admin/bzrmerge.el | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) (limited to 'admin') 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 + + * 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 * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as 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))) -- cgit v1.2.1 From 7a22e700110b98363a940b14efa8ad5af57c29e2 Mon Sep 17 00:00:00 2001 From: Ognyan Kulev Date: Sat, 21 Jan 2012 22:58:38 +0800 Subject: Update TUTORIAL.bg. --- admin/FOR-RELEASE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'admin') diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 6b10d51b970..9335e5b1fbe 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 @@ -215,7 +215,7 @@ minibuf.texi modes.texi nonascii.texi numbers.texi -objects.texi +objects.texi cyd os.texi package.texi positions.texi -- cgit v1.2.1 From 31cbea1d3d3c548025f70551514bd1a370301ccf Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 23 Jan 2012 12:23:50 +0800 Subject: Update several Lisp manual chapters. * doc/lispref/eval.texi (Intro Eval, Symbol Forms): Minor tweaks for correctness with lexical scoping. (Eval): Copyedits. * doc/lispref/sequences.texi (Sequence Functions): Don't repeat the introduction already given in the parent. (Vectors): Copyedits. (Rings): Move from lists.texi. Note that this is specific to the ring package. * doc/lispref/lists.texi (Cons Cells): Copyedits. (List Elements): Mention push. (List Variables): Mention pop. (Rings): Move to sequences.texi. * doc/lispref/strings.texi (Text Comparison): Minor qualification. * doc/lispref/symbols.texi (Definitions, Symbol Components): Mention variable scoping issues. (Plists and Alists): Copyedits. --- admin/FOR-RELEASE | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'admin') diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 9335e5b1fbe..f704a3c9397 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -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 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 +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 ? -- cgit v1.2.1