Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

3 files changed, 40 insertions, 30 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 706b2f68c8d..c3252d3ff70 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-05  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-version): Handle configure.in.  Adapt for doc/
+        directory layout for manuals.
+
+2007-12-01  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * FOR-RELEASE: Remove Gnus send mail problem.  Other Gnus bugs
+        have been fixed in Gnus CVS but have not yet been synched to
+        Emacs.
+
+2007-11-17  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (process-lines): Move to ../lisp/subr.el.
+
 2007-10-23  Glenn Morris  <rgm@gnu.org>
 
         * MAINTAINERS: Move here from ../.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 387baade381..3ab61ba577c 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -89,23 +89,31 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00209.html
 ** menu indications of key bindings for remapped commands
 http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg01339.html
 
-** tromey@redhat.com: two View-mode "quit" bugs
-http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00103.html
-
 ** rms: gnus-dired.el is a mistake.  Those features should not
 be part of Gnus.  They should be moved to some other part of Emacs.
 
-** C-x v v no longer works the way it used to
-http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00785.html
+** sdl.web@gmail.com, 28 Oct: window-system in face definition
+
+** Gnus archive groups are not shown at all if they are not at the default level. 
+Fixed in Gnus CVS, but the patch has not been synched to Emacs yet:
+http://thread.gmane.org/gmane.emacs.gnus.general/65622/focus=65757
 
-** vc-diff no longer works the way it used to
-http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01753.html
-(vc-revert also needs the repository now with CVS)
+** Extra question asked when doing a reply in Gnus
+Fixed in Gnus CVS, but the patch has not been synched to Emacs yet:
+http://thread.gmane.org/gmane.emacs.gnus.general/65627/65768
 
-** sdl.web@gmail.com, 28 Oct: window-system in face definition
+** sdl.web@gmail.com, 30 Oct: ps-lpr-switches has no effect
+
+** Stephen.Berman@gmx.net: minibuffer and current-local-map
+
+** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround
+
+** Get rid of old-style backquotes in cc-vars.el.
+ttn has a patch:
+http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html
 
-** add README files for etc/gnus, etc/images/smilies/medium,grayscale
-update etc/images README files with any new images
+** Fix or document the shortcoming of easymenu and :suffix.
+http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
 
 * DOCUMENTATION
 
diff --git a/admin/admin.el b/admin/admin.el
index 76c50243b3d..a490442a44b 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -29,23 +29,6 @@
 
 ;;; Code:
 
-(defun process-lines (program &rest args)
-  "Execute PROGRAM with ARGS, returning its output as a list of lines.
-Signal an error if the program returns with a non-zero exit status."
-  (with-temp-buffer
-    (let ((status (apply 'call-process program nil (current-buffer) nil args)))
-      (unless (eq status 0)
-        (error "%s exited with status %s" program status))
-      (goto-char (point-min))
-      (let (lines)
-        (while (not (eobp))
-          (setq lines (cons (buffer-substring-no-properties
-                             (line-beginning-position)
-                             (line-end-position))
-                            lines))
-          (forward-line 1))
-        (nreverse lines)))))
-
 (defun add-release-logs (root version)
   "Add \"Version VERSION released.\" change log entries in ROOT.
 Root must be the root of an Emacs source tree."
@@ -85,10 +68,14 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "README" version
                        (rx (and "version" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "man/emacs.texi" version
+  (set-version-in-file root "configure.in" version
+                       (rx (and "AC_INIT" (1+ (not (in ?,)))
+                                ?, (0+ space)
+                                (submatch (1+ (in "0-9."))))))
+  (set-version-in-file root "doc/emacs/emacs.texi" version
                        (rx (and "EMACSVER" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "lispref/elisp.texi" version
+  (set-version-in-file root "doc/lispref/elisp.texi" version
                        (rx (and "EMACSVER" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "lib-src/makefile.w32-in" version