Merge lp:~laney/ubuntu/quantal/emacs23/merge-23.4 into lp:ubuntu/quantal/emacs23

[Iain Lane]

I stole this from barry without asking (well, he wasn't on IRC, what was I supposed to do?). I suspect he won't mind :P.

Perhaps he wants to review. :-)

It might make sense for bug #998460 to be processed first, but I suspect that not many people will have it installed so it shouldn't matter in practice.

[Barry Warsaw (barry)]

That's for doing this merge, and no I don't mind at all :). It'll be nice to have 23.4 in Quantal. Do you know what the plans are for Emacs 24 in Debian? (I know it hasn't been released yet.)

I think I'll refrain from reviewing the 453k line diff. :)

[Bryce Harrington (bryce)]

<slangasek> it sounds like it might be easier to just shuffle the pockets, and keep the packages in sync with Debian
<infinity> Laney: If... Err, what vorlon said. :P
<infinity> If emacs23-non-dfsg really is just the same stuff that we're adding back in our diff, that seems like a silly amount of effort for us.
<slangasek> the only binary package it builds is emacs23-common-non-dfsg... should that be a dependency of emacs?
<slangasek> honestly, either way, I think that may be the simpler route
<slangasek> i.e. I don't see any barrier to having it in main if that's where it belongs
<slangasek> in fact since it's just a binary package split, it shouldn't need a MIR
<Laney> if we're OK having it in main as a Depends, that should get us to ~ where we are now
<Laney> and let us drop a bunch of delta
<infinity> Sounds reasonable to me.
<bryceh> dropping delta sounds nice
<slangasek> it's just the docs, after all
<slangasek> Laney: I'm in favor of just making it a binary dep from emacs23 and avoiding the horror deltas :)
<slangasek> rather, from emacs23-common
<Laney> rock
<Laney> deleted debian/patches/ubuntu-restore-nondfsg-files.diff

review: Needs Fixing

=== removed directory '.pc/0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch'
=== removed directory '.pc/0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch/lisp'
=== removed file '.pc/0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch/lisp/site-init.el'
=== removed directory '.pc/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch'
=== removed directory '.pc/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch/lisp'
=== removed file '.pc/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch/lisp/startup.el'
--- .pc/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch/lisp/startup.el	2011-04-10 10:33:31 +0000
+++ .pc/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch/lisp/startup.el	1970-01-01 00:00:00 +0000
@@ -1,2346 +0,0 @@
-;;; startup.el --- process Emacs shell arguments
-
-;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
-
-;; Maintainer: FSF
-;; Keywords: internal
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file parses the command line and gets Emacs running.  Options
-;; on the command line are handled in precedence order.  For priorities
-;; see the structure standard_args in the emacs.c file.
-
-;;; Code:
-
-(setq top-level '(normal-top-level))
-
-(defvar command-line-processed nil
-  "Non-nil once command line has been processed.")
-
-(defgroup initialization nil
-  "Emacs start-up procedure."
-  :group 'environment)
-
-(defcustom initial-buffer-choice nil
-  "Buffer to show after starting Emacs.
-If the value is nil and `inhibit-startup-screen' is nil, show the
-startup screen.  If the value is string, visit the specified file or
-directory using `find-file'.  If t, open the `*scratch*' buffer."
-  :type '(choice
-	  (const     :tag "Startup screen" nil)
-	  (directory :tag "Directory" :value "~/")
-	  (file      :tag "File" :value "~/.emacs")
-	  (const     :tag "Lisp scratch buffer" t))
-  :version "23.1"
-  :group 'initialization)
-
-(defcustom inhibit-startup-screen nil
-  "Non-nil inhibits the startup screen.
-
-This is for use in your personal init file (but NOT site-start.el),
-once you are familiar with the contents of the startup screen."
-  :type 'boolean
-  :group 'initialization)
-
-(defvaralias 'inhibit-splash-screen 'inhibit-startup-screen)
-(defvaralias 'inhibit-startup-message 'inhibit-startup-screen)
-
-(defvar startup-screen-inhibit-startup-screen nil)
-
-(defcustom inhibit-startup-echo-area-message nil
-  "Non-nil inhibits the initial startup echo area message.
-Setting this variable takes effect
-only if you do it with the customization buffer
-or if your `.emacs' file contains a line of this form:
- (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")
-If your `.emacs' file is byte-compiled, use the following form instead:
- (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\"))
-Thus, someone else using a copy of your `.emacs' file will see
-the startup message unless he personally acts to inhibit it."
-  :type '(choice (const :tag "Don't inhibit")
-		 (string :tag "Enter your user name, to inhibit"))
-  :group 'initialization)
-
-(defcustom inhibit-default-init nil
-  "Non-nil inhibits loading the `default' library."
-  :type 'boolean
-  :group 'initialization)
-
-(defcustom inhibit-startup-buffer-menu nil
-  "Non-nil inhibits display of buffer list when more than 2 files are loaded."
-  :type 'boolean
-  :group 'initialization)
-
-(defvar command-switch-alist nil
-  "Alist of command-line switches.
-Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
-HANDLER-FUNCTION receives the switch string as its sole argument;
-the remaining command-line args are in the variable `command-line-args-left'.")
-
-(defvar command-line-args-left nil
-  "List of command-line args not yet processed.")
-
-(defvaralias 'argv 'command-line-args-left
-  "List of command-line args not yet processed.
-This is a convenience alias, so that one can write \(pop argv\)
-inside of --eval command line arguments in order to access
-following arguments.")
-
-(defvar command-line-functions nil    ;; lrs 7/31/89
-  "List of functions to process unrecognized command-line arguments.
-Each function should access the dynamically bound variables
-`argi' (the current argument) and `command-line-args-left' (the remaining
-arguments).  The function should return non-nil only if it recognizes and
-processes `argi'.  If it does so, it may consume successive arguments by
-altering `command-line-args-left' to remove them.")
-
-(defvar command-line-default-directory nil
-  "Default directory to use for command line arguments.
-This is normally copied from `default-directory' when Emacs starts.")
-
-;;; This is here, rather than in x-win.el, so that we can ignore these
-;;; options when we are not using X.
-(defconst command-line-x-option-alist
-  '(("-bw" 1 x-handle-numeric-switch border-width)
-    ("-d" 1 x-handle-display)
-    ("-display" 1 x-handle-display)
-    ("-name" 1 x-handle-name-switch)
-    ("-title" 1 x-handle-switch title)
-    ("-T" 1 x-handle-switch title)
-    ("-r" 0 x-handle-switch reverse t)
-    ("-rv" 0 x-handle-switch reverse t)
-    ("-reverse" 0 x-handle-switch reverse t)
-    ("-reverse-video" 0 x-handle-switch reverse t)
-    ("-fn" 1 x-handle-switch font)
-    ("-font" 1 x-handle-switch font)
-    ("-fs" 0 x-handle-initial-switch fullscreen fullboth)
-    ("-fw" 0 x-handle-initial-switch fullscreen fullwidth)
-    ("-fh" 0 x-handle-initial-switch fullscreen fullheight)
-    ("-mm" 0 x-handle-initial-switch fullscreen maximized)
-    ("-ib" 1 x-handle-numeric-switch internal-border-width)
-    ("-g" 1 x-handle-geometry)
-    ("-lsp" 1 x-handle-numeric-switch line-spacing)
-    ("-geometry" 1 x-handle-geometry)
-    ("-fg" 1 x-handle-switch foreground-color)
-    ("-foreground" 1 x-handle-switch foreground-color)
-    ("-bg" 1 x-handle-switch background-color)
-    ("-background" 1 x-handle-switch background-color)
-    ("-ms" 1 x-handle-switch mouse-color)
-    ("-nbi" 0 x-handle-switch icon-type nil)
-    ("-iconic" 0 x-handle-iconic)
-    ("-xrm" 1 x-handle-xrm-switch)
-    ("-cr" 1 x-handle-switch cursor-color)
-    ("-vb" 0 x-handle-switch vertical-scroll-bars t)
-    ("-hb" 0 x-handle-switch horizontal-scroll-bars t)
-    ("-bd" 1 x-handle-switch)
-    ("--border-width" 1 x-handle-numeric-switch border-width)
-    ("--display" 1 x-handle-display)
-    ("--name" 1 x-handle-name-switch)
-    ("--title" 1 x-handle-switch title)
-    ("--reverse-video" 0 x-handle-switch reverse t)
-    ("--font" 1 x-handle-switch font)
-    ("--fullscreen" 0 x-handle-initial-switch fullscreen fullboth)
-    ("--fullwidth" 0 x-handle-initial-switch fullscreen fullwidth)
-    ("--fullheight" 0 x-handle-initial-switch fullscreen fullheight)
-    ("--maximized" 0 x-handle-initial-switch fullscreen maximized)
-    ("--internal-border" 1 x-handle-numeric-switch internal-border-width)
-    ("--geometry" 1 x-handle-geometry)
-    ("--foreground-color" 1 x-handle-switch foreground-color)
-    ("--background-color" 1 x-handle-switch background-color)
-    ("--mouse-color" 1 x-handle-switch mouse-color)
-    ("--no-bitmap-icon" 0 x-handle-no-bitmap-icon)
-    ("--iconic" 0 x-handle-iconic)
-    ("--xrm" 1 x-handle-xrm-switch)
-    ("--cursor-color" 1 x-handle-switch cursor-color)
-    ("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t)
-    ("--line-spacing" 1 x-handle-numeric-switch line-spacing)
-    ("--border-color" 1 x-handle-switch border-color)
-    ("--smid" 1 x-handle-smid)
-    ("--parent-id" 1 x-handle-parent-id))
-  "Alist of X Windows options.
-Each element has the form
-  (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
-where NAME is the option name string, NUMARGS is the number of arguments
-that the option accepts, HANDLER is a function to call to handle the option.
-FRAME-PARAM (optional) is the frame parameter this option specifies,
-and VALUE is the value which is given to that frame parameter
-\(most options use the argument for this, so VALUE is not present).")
-
-(defconst command-line-ns-option-alist
-  '(("-NSAutoLaunch" 1 ns-ignore-1-arg)
-    ("-NXAutoLaunch" 1 ns-ignore-1-arg)
-    ("-macosx" 0 ignore)
-    ("-NSHost" 1 ns-ignore-1-arg)
-    ("-_NSMachLaunch" 1 ns-ignore-1-arg)
-    ("-MachLaunch" 1 ns-ignore-1-arg)
-    ("-NXOpen" 1 ns-ignore-1-arg)
-    ("-NSOpen" 1 ns-handle-nxopen)
-    ("-NXOpenTemp" 1 ns-ignore-1-arg)
-    ("-NSOpenTemp" 1 ns-handle-nxopentemp)
-    ("-GSFilePath" 1 ns-handle-nxopen)
-    ;;("-bw" .              x-handle-numeric-switch)
-    ;;("-d" .               x-handle-display)
-    ;;("-display" .         x-handle-display)
-    ("-name" 1 ns-handle-name-switch)
-    ("-title" 1 ns-handle-switch title)
-    ("-T" 1 ns-handle-switch title)
-    ("-r" 0 ns-handle-switch reverse t)
-    ("-rv" 0 ns-handle-switch reverse t)
-    ("-reverse" 0 ns-handle-switch reverse t)
-    ("-fn" 1 ns-handle-switch font)
-    ("-font" 1 ns-handle-switch font)
-    ("-ib" 1 ns-handle-numeric-switch internal-border-width)
-    ;;("-g" .               x-handle-geometry)
-    ;;("-geometry" .        x-handle-geometry)
-    ("-fg" 1 ns-handle-switch foreground-color)
-    ("-foreground" 1 ns-handle-switch foreground-color)
-    ("-bg" 1 ns-handle-switch background-color)
-    ("-background" 1 ns-handle-switch background-color)
-;    ("-ms" 1 ns-handle-switch mouse-color)
-    ("-itype" 0 ns-handle-switch icon-type t)
-    ("-i" 0 ns-handle-switch icon-type t)
-    ("-iconic" 0 ns-handle-iconic icon-type t)
-    ;;("-xrm" .             x-handle-xrm-switch)
-    ("-cr" 1 ns-handle-switch cursor-color)
-    ("-vb" 0 ns-handle-switch vertical-scroll-bars t)
-    ("-hb" 0 ns-handle-switch horizontal-scroll-bars t)
-    ("-bd" 1 ns-handle-switch)
-    ;; ("--border-width" 1 ns-handle-numeric-switch border-width)
-    ;; ("--display" 1 ns-handle-display)
-    ("--name" 1 ns-handle-name-switch)
-    ("--title" 1 ns-handle-switch title)
-    ("--reverse-video" 0 ns-handle-switch reverse t)
-    ("--font" 1 ns-handle-switch font)
-    ("--internal-border" 1 ns-handle-numeric-switch internal-border-width)
-    ;; ("--geometry" 1 ns-handle-geometry)
-    ("--foreground-color" 1 ns-handle-switch foreground-color)
-    ("--background-color" 1 ns-handle-switch background-color)
-    ("--mouse-color" 1 ns-handle-switch mouse-color)
-    ("--icon-type" 0 ns-handle-switch icon-type t)
-    ("--iconic" 0 ns-handle-iconic)
-    ;; ("--xrm" 1 ns-handle-xrm-switch)
-    ("--cursor-color" 1 ns-handle-switch cursor-color)
-    ("--vertical-scroll-bars" 0 ns-handle-switch vertical-scroll-bars t)
-    ("--border-color" 1 ns-handle-switch border-width))
-  "Alist of NS options.
-Each element has the form
-  (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
-where NAME is the option name string, NUMARGS is the number of arguments
-that the option accepts, HANDLER is a function to call to handle the option.
-FRAME-PARAM (optional) is the frame parameter this option specifies,
-and VALUE is the value which is given to that frame parameter
-\(most options use the argument for this, so VALUE is not present).")
-
-
-(defvar before-init-hook nil
-  "Normal hook run after handling urgent options but before loading init files.")
-
-(defvar after-init-hook nil
-  "Normal hook run after loading the init files, `~/.emacs' and `default.el'.
-There is no `condition-case' around the running of these functions;
-therefore, if you set `debug-on-error' non-nil in `.emacs',
-an error in one of these functions will invoke the debugger.")
-
-(defvar emacs-startup-hook nil
-  "Normal hook run after loading init files and handling the command line.")
-
-(defvar term-setup-hook nil
-  "Normal hook run after loading terminal-specific Lisp code.
-It also follows `emacs-startup-hook'.  This hook exists for users to set,
-so as to override the definitions made by the terminal-specific file.
-Emacs never sets this variable itself.")
-
-(defvar inhibit-startup-hooks nil
-  "Non-nil means don't run `term-setup-hook' and `emacs-startup-hook'.
-This is because we already did so.")
-
-(defvar keyboard-type nil
-  "The brand of keyboard you are using.
-This variable is used to define the proper function and keypad
-keys for use under X.  It is used in a fashion analogous to the
-environment variable TERM.")
-
-(defvar window-setup-hook nil
-  "Normal hook run to initialize window system display.
-Emacs runs this hook after processing the command line arguments and loading
-the user's init file.")
-
-(defcustom initial-major-mode 'lisp-interaction-mode
-  "Major mode command symbol to use for the initial `*scratch*' buffer."
-  :type 'function
-  :group 'initialization)
-
-(defvar init-file-user nil
-  "Identity of user whose `.emacs' file is or was read.
-The value is nil if `-q' or `--no-init-file' was specified,
-meaning do not load any init file.
-
-Otherwise, the value may be an empty string, meaning
-use the init file for the user who originally logged in,
-or it may be a string containing a user's name meaning
-use that person's init file.
-
-In either of the latter cases, `(concat \"~\" init-file-user \"/\")'
-evaluates to the name of the directory where the `.emacs' file was
-looked for.
-
-Setting `init-file-user' does not prevent Emacs from loading
-`site-start.el'.  The only way to do that is to use `--no-site-file'.")
-
-(defcustom site-run-file (purecopy "site-start")
-  "File containing site-wide run-time initializations.
-This file is loaded at run-time before `~/.emacs'.  It contains inits
-that need to be in place for the entire site, but which, due to their
-higher incidence of change, don't make sense to load into Emacs's
-dumped image.  Thus, the run-time load order is: 1. file described in
-this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.
-
-Don't use the `site-start.el' file for things some users may not like.
-Put them in `default.el' instead, so that users can more easily
-override them.  Users can prevent loading `default.el' with the `-q'
-option or by setting `inhibit-default-init' in their own init files,
-but inhibiting `site-start.el' requires `--no-site-file', which
-is less convenient.
-
-This variable is defined for customization so as to make
-it visible in the relevant context.  However, actually customizing it
-is not allowed, since it would not work anyway.  The only way to set
-this variable usefully is to set it while building and dumping Emacs."
-  :type '(choice (const :tag "none" nil) string)
-  :group 'initialization
-  :initialize 'custom-initialize-default
-  :set (lambda (variable value)
-	  (error "Customizing `site-run-file' does not work")))
-
-(defcustom mail-host-address nil
-  "Name of this machine, for purposes of naming users."
-  :type '(choice (const nil) string)
-  :group 'mail)
-
-(defcustom user-mail-address (if command-line-processed
-				 (or (getenv "EMAIL")
-				     (concat (user-login-name) "@"
-					     (or mail-host-address
-						 (system-name))))
-			       ;; Empty string means "not set yet".
-			       "")
-  "Full mailing address of this user.
-This is initialized with environment variable `EMAIL' or, as a
-fallback, using `mail-host-address'.  This is done after your
-init file is read, in case it sets `mail-host-address'."
-  :type 'string
-  :group 'mail)
-
-(defcustom auto-save-list-file-prefix
-  (cond ((eq system-type 'ms-dos)
-	 ;; MS-DOS cannot have initial dot, and allows only 8.3 names
-	 (concat user-emacs-directory "auto-save.list/_s"))
-	(t
-	 (concat user-emacs-directory "auto-save-list/.saves-")))
-  "Prefix for generating `auto-save-list-file-name'.
-This is used after reading your `.emacs' file to initialize
-`auto-save-list-file-name', by appending Emacs's pid and the system name,
-if you have not already set `auto-save-list-file-name' yourself.
-Directories in the prefix will be created if necessary.
-Set this to nil if you want to prevent `auto-save-list-file-name'
-from being initialized."
-  :type '(choice (const :tag "Don't record a session's auto save list" nil)
-		 string)
-  :group 'auto-save)
-
-(defvar emacs-basic-display nil)
-
-(defvar init-file-debug nil)
-
-(defvar init-file-had-error nil
-  "Non-nil if there was an error loading the user's init file.")
-
-(defvar normal-top-level-add-subdirs-inode-list nil)
-
-(defvar no-blinking-cursor nil)
-
-(defvar default-frame-background-mode)
-
-(defvar pure-space-overflow nil
-  "Non-nil if building Emacs overflowed pure space.")
-
-(defvar pure-space-overflow-message (purecopy "\
-Warning Warning!!!  Pure space overflow    !!!Warning Warning
-\(See the node Pure Storage in the Lisp manual for details.)\n"))
-
-(defcustom tutorial-directory
-  (file-name-as-directory (expand-file-name "tutorials" data-directory))
-  "Directory containing the Emacs TUTORIAL files."
-  :group 'installation
-  :type 'directory
-  :initialize 'custom-initialize-delay)
-
-(defun normal-top-level-add-subdirs-to-load-path ()
-  "Add all subdirectories of current directory to `load-path'.
-More precisely, this uses only the subdirectories whose names
-start with letters or digits; it excludes any subdirectory named `RCS'
-or `CVS', and any subdirectory that contains a file named `.nosearch'."
-  (let (dirs
-	attrs
-	(pending (list default-directory)))
-    ;; This loop does a breadth-first tree walk on DIR's subtree,
-    ;; putting each subdir into DIRS as its contents are examined.
-    (while pending
-      (push (pop pending) dirs)
-      (let* ((this-dir (car dirs))
-	     (contents (directory-files this-dir))
-	     (default-directory this-dir)
-	     (canonicalized (if (fboundp 'untranslated-canonical-name)
-				(untranslated-canonical-name this-dir))))
-	;; The Windows version doesn't report meaningful inode
-	;; numbers, so use the canonicalized absolute file name of the
-	;; directory instead.
-	(setq attrs (or canonicalized
-			(nthcdr 10 (file-attributes this-dir))))
-	(unless (member attrs normal-top-level-add-subdirs-inode-list)
-	  (push attrs normal-top-level-add-subdirs-inode-list)
-	  (dolist (file contents)
-	    ;; The lower-case variants of RCS and CVS are for DOS/Windows.
-	    (unless (member file '("." ".." "RCS" "CVS" "rcs" "cvs"))
-	      (when (and (string-match "\\`[[:alnum:]]" file)
-			 ;; Avoid doing a `stat' when it isn't necessary
-			 ;; because that can cause trouble when an NFS server
-			 ;; is down.
-			 (not (string-match "\\.elc?\\'" file))
-			 (file-directory-p file))
-		(let ((expanded (expand-file-name file)))
-		  (unless (file-exists-p (expand-file-name ".nosearch"
-							   expanded))
-		    (setq pending (nconc pending (list expanded)))))))))))
-    (normal-top-level-add-to-load-path (cdr (nreverse dirs)))))
-
-;; This function is called from a subdirs.el file.
-;; It assumes that default-directory is the directory
-;; in which the subdirs.el file exists,
-;; and it adds to load-path the subdirs of that directory
-;; as specified in DIRS.  Normally the elements of DIRS are relative.
-(defun normal-top-level-add-to-load-path (dirs)
-  (let ((tail load-path)
-	(thisdir (directory-file-name default-directory)))
-    (while (and tail
-		;;Don't go all the way to the nil terminator.
-		(cdr tail)
-		(not (equal thisdir (car tail)))
-		(not (and (memq system-type '(ms-dos windows-nt))
-			  (equal (downcase thisdir) (downcase (car tail))))))
-      (setq tail (cdr tail)))
-    ;;Splice the new section in.
-    (when tail
-      (setcdr tail (append (mapcar 'expand-file-name dirs) (cdr tail))))))
-
-(defun normal-top-level ()
-  (if command-line-processed
-      (message "Back to top level.")
-    (setq command-line-processed t)
-    (let ((dir default-directory))
-      (with-current-buffer "*Messages*"
-        ;; Make it easy to do like "tail -f".
-        (set (make-local-variable 'window-point-insertion-type) t)
-        ;; Give *Messages* the same default-directory as *scratch*,
-        ;; just to keep things predictable.
-	(setq default-directory dir)))
-    ;; `user-full-name' is now known; reset its standard-value here.
-    (put 'user-full-name 'standard-value
-	 (list (default-value 'user-full-name)))
-    ;; For root, preserve owner and group when editing files.
-    (if (equal (user-uid) 0)
-	(setq backup-by-copying-when-mismatch t))
-    ;; Look in each dir in load-path for a subdirs.el file.
-    ;; If we find one, load it, which will add the appropriate subdirs
-    ;; of that dir into load-path,
-    ;; Look for a leim-list.el file too.  Loading it will register
-    ;; available input methods.
-    (let ((tail load-path) dir)
-      (while tail
-        (setq dir (car tail))
-        (let ((default-directory dir))
-          (load (expand-file-name "subdirs.el") t t t))
-        (let ((default-directory dir))
-          (load (expand-file-name "leim-list.el") t t t))
-        ;; We don't use a dolist loop and we put this "setq-cdr" command at
-        ;; the end, because the subdirs.el files may add elements to the end
-        ;; of load-path and we want to take it into account.
-        (setq tail (cdr tail))))
-    ;; If the PWD environment variable isn't accurate, delete it.
-    (let ((pwd (getenv "PWD")))
-      (and (stringp pwd)
-	   ;; Use FOO/., so that if FOO is a symlink, file-attributes
-	   ;; describes the directory linked to, not FOO itself.
-	   (or (equal (file-attributes
-		       (concat (file-name-as-directory pwd) "."))
-		      (file-attributes
-		       (concat (file-name-as-directory default-directory)
-			       ".")))
-	       (setq process-environment
-		     (delete (concat "PWD=" pwd)
-			     process-environment)))))
-    (setq default-directory (abbreviate-file-name default-directory))
-    (let ((old-face-font-rescale-alist face-font-rescale-alist))
-      (unwind-protect
-	  (command-line)
-	;; Do this again, in case .emacs defined more abbreviations.
-	(setq default-directory (abbreviate-file-name default-directory))
-	;; Specify the file for recording all the auto save files of this session.
-	;; This is used by recover-session.
-	(or auto-save-list-file-name
-	    (and auto-save-list-file-prefix
-		 (setq auto-save-list-file-name
-		       ;; Under MS-DOS our PID is almost always reused between
-		       ;; Emacs invocations.  We need something more unique.
-		       (cond ((eq system-type 'ms-dos)
-			      ;; We are going to access the auto-save
-			      ;; directory, so make sure it exists.
-			      (make-directory
-			       (file-name-directory auto-save-list-file-prefix)
-			       t)
-			      (concat
-			       (make-temp-name
-				(expand-file-name
-				 auto-save-list-file-prefix))
-			       "~"))
-			     (t
-			      (expand-file-name
-			       (format "%s%d-%s~"
-				       auto-save-list-file-prefix
-				       (emacs-pid)
-				       (system-name))))))))
-	(unless inhibit-startup-hooks
-	  (run-hooks 'emacs-startup-hook)
-	  (and term-setup-hook
-	       (run-hooks 'term-setup-hook)))
-
-	;; Don't do this if we failed to create the initial frame,
-	;; for instance due to a dense colormap.
-	(when (or frame-initial-frame
-		  ;; If frame-initial-frame has no meaning, do this anyway.
-		  (not (and initial-window-system
-			    (not noninteractive)
-			    (not (eq initial-window-system 'pc)))))
-
-	  ;; FIXME: The user's init file may change
-	  ;; face-font-rescale-alist.  However, the default face
-	  ;; already has an assigned font object, which does not take
-	  ;; face-font-rescale-alist into account.  For such
-	  ;; situations, we ought to have a way to find all font
-	  ;; objects and regenerate them; currently we do not.  As a
-	  ;; workaround, we specifically reset te default face's :font
-	  ;; attribute here.  See bug#1785.
-	  (unless (eq face-font-rescale-alist
-		      old-face-font-rescale-alist)
-	    (set-face-attribute 'default nil :font (font-spec)))
-
-	  ;; Modify the initial frame based on what .emacs puts into
-	  ;; ...-frame-alist.
-	  (if (fboundp 'frame-notice-user-settings)
-	      (frame-notice-user-settings))
-	  ;; Set the faces for the initial background mode even if
-	  ;; frame-notice-user-settings didn't (such as on a tty).
-	  ;; frame-set-background-mode is idempotent, so it won't
-	  ;; cause any harm if it's already been done.
-	  (if (fboundp 'frame-set-background-mode)
-	      (frame-set-background-mode (selected-frame))))
-
-	;; Now we know the user's default font, so add it to the menu.
-	(if (fboundp 'font-menu-add-default)
-	    (font-menu-add-default))
-	(and window-setup-hook
-	     (run-hooks 'window-setup-hook))))
-    ;; Subprocesses of Emacs do not have direct access to the terminal, so
-    ;; unless told otherwise they should only assume a dumb terminal.
-    ;; We are careful to do it late (after term-setup-hook), although the
-    ;; new multi-tty code does not use $TERM any more there anyway.
-    (setenv "TERM" "dumb")
-    ;; Remove DISPLAY from the process-environment as well.  This allows
-    ;; `callproc.c' to give it a useful adaptive default which is either
-    ;; the value of the `display' frame-parameter or the DISPLAY value
-    ;; from initial-environment.
-    (let ((display (frame-parameter nil 'display)))
-      ;; Be careful which DISPLAY to remove from process-environment: follow
-      ;; the logic of `callproc.c'.
-      (if (stringp display) (setq display (concat "DISPLAY=" display))
-        (dolist (varval initial-environment)
-          (if (string-match "\\`DISPLAY=" varval)
-              (setq display varval))))
-      (when display
-        (delete display process-environment)))))
-
-;; Precompute the keyboard equivalents in the menu bar items.
-;; Command-line options supported by tty's:
-(defconst tty-long-option-alist
-  '(("--name"		  . "-name")
-    ("--title"		  . "-T")
-    ("--reverse-video"	  . "-reverse")
-    ("--foreground-color" . "-fg")
-    ("--background-color" . "-bg")
-    ("--color"		  . "-color")))
-
-(defconst tool-bar-images-pixel-height 24
-  "Height in pixels of images in the tool-bar.")
-
-(defvar tool-bar-originally-present nil
-  "Non-nil if tool-bars are present before user and site init files are read.")
-
-(defvar handle-args-function-alist '((nil . tty-handle-args))
-  "Functions for processing window-system dependent command-line arguments.
-Window system startup files should add their own function to this
-alist, which should parse the command line arguments.  Those
-pertaining to the window system should be processed and removed
-from the returned command line.")
-
-(defvar window-system-initialization-alist '((nil . ignore))
-  "Alist of window-system initialization functions.
-Window-system startup files should add their own initialization
-function to this list.  The function should take no arguments,
-and initialize the window system environment to prepare for
-opening the first frame (e.g. open a connection to an X server).")
-
-;; Handle the X-like command-line arguments "-fg", "-bg", "-name", etc.
-(defun tty-handle-args (args)
-  (let (rest)
-    (message "%S" args)
-    (while (and args
-		(not (equal (car args) "--")))
-      (let* ((argi (pop args))
-	     (orig-argi argi)
-	     argval completion)
-	;; Check for long options with attached arguments
-	;; and separate out the attached option argument into argval.
-	(when (string-match "^\\(--[^=]*\\)=" argi)
-          (setq argval (substring argi (match-end 0))
-                argi (match-string 1 argi)))
-	(when (string-match "^--" argi)
-	  (setq completion (try-completion argi tty-long-option-alist))
-	  (if (eq completion t)
-	      ;; Exact match for long option.
-	      (setq argi (cdr (assoc argi tty-long-option-alist)))
-	    (if (stringp completion)
-		(let ((elt (assoc completion tty-long-option-alist)))
-		  ;; Check for abbreviated long option.
-		  (or elt
-		      (error "Option `%s' is ambiguous" argi))
-		  (setq argi (cdr elt)))
-	      ;; Check for a short option.
-	      (setq argval nil
-                    argi orig-argi))))
-	(cond ((member argi '("-fg" "-foreground"))
-	       (push (cons 'foreground-color (or argval (pop args)))
-                     default-frame-alist))
-	      ((member argi '("-bg" "-background"))
-	       (push (cons 'background-color (or argval (pop args)))
-                     default-frame-alist))
-	      ((member argi '("-T" "-name"))
-	       (unless argval (setq argval (pop args)))
-	       (push (cons 'title
-                           (if (stringp argval)
-                               argval
-                             (let ((case-fold-search t)
-                                   i)
-                               (setq argval (invocation-name))
-
-                               ;; Change any . or * characters in name to
-                               ;; hyphens, so as to emulate behavior on X.
-                               (while
-                                   (setq i (string-match "[.*]" argval))
-                                 (aset argval i ?-))
-                               argval)))
-                     default-frame-alist))
-	      ((member argi '("-r" "-rv" "-reverse"))
-	       (push '(reverse . t)
-                     default-frame-alist))
-	      ((equal argi "-color")
-	       (unless argval (setq argval 8)) ; default --color means 8 ANSI colors
-	       (push (cons 'tty-color-mode
-                           (cond
-                            ((numberp argval) argval)
-                            ((string-match "-?[0-9]+" argval)
-                             (string-to-number argval))
-                            (t (intern argval))))
-                     default-frame-alist))
-	      (t
-               (push argi rest)))))
-    (nreverse rest)))
-
-(declare-function x-get-resource "frame.c"
-		  (attribute class &optional component subclass))
-(declare-function tool-bar-mode "tool-bar" (&optional arg))
-(declare-function tool-bar-setup "tool-bar")
-
-(defvar server-name)
-(defvar server-process)
-
-(defun command-line ()
-  (setq before-init-time (current-time)
-	after-init-time nil
-        command-line-default-directory default-directory)
-
-  ;; Force recomputation, in case it was computed during the dump.
-  (setq abbreviated-home-dir nil)
-
-  ;; See if we should import version-control from the environment variable.
-  (let ((vc (getenv "VERSION_CONTROL")))
-    (cond ((eq vc nil))			;don't do anything if not set
-	  ((member vc '("t" "numbered"))
-	   (setq version-control t))
-	  ((member vc '("nil" "existing"))
-	   (setq version-control nil))
-	  ((member vc '("never" "simple"))
-	   (setq version-control 'never))))
-
-  ;;! This has been commented out; I currently find the behavior when
-  ;;! split-window-keep-point is nil disturbing, but if I can get used
-  ;;! to it, then it would be better to eliminate the option.
-  ;;! ;; Choose a good default value for split-window-keep-point.
-  ;;! (setq split-window-keep-point (> baud-rate 2400))
-
-  ;; Set the default strings to display in mode line for
-  ;; end-of-line formats that aren't native to this platform.
-  (cond
-   ((memq system-type '(ms-dos windows-nt))
-    (setq eol-mnemonic-unix "(Unix)"
-          eol-mnemonic-mac  "(Mac)"))
-   (t                                   ; this is for Unix/GNU/Linux systems
-    (setq eol-mnemonic-dos  "(DOS)"
-          eol-mnemonic-mac  "(Mac)")))
-
-  (set-locale-environment nil)
-
-  ;; Convert preloaded file names in load-history to absolute.
-  (let ((simple-file-name
-	 ;; Look for simple.el or simple.elc and use their directory
-	 ;; as the place where all Lisp files live.
-	 (locate-file "simple" load-path (get-load-suffixes)))
-	lisp-dir)
-    ;; Don't abort if simple.el cannot be found, but print a warning.
-    (if (null simple-file-name)
-	(progn
-	  (princ "Warning: Could not find simple.el nor simple.elc"
-		 'external-debugging-output)
-	  (terpri 'external-debugging-output))
-      (setq lisp-dir (file-truename (file-name-directory simple-file-name)))
-      (setq load-history
-	    (mapcar (lambda (elt)
-		      (if (and (stringp (car elt))
-			       (not (file-name-absolute-p (car elt))))
-			  (cons (concat lisp-dir
-					(car elt))
-				(cdr elt))
-			elt))
-		    load-history))))
-
-  ;; Convert the arguments to Emacs internal representation.
-  (let ((args (cdr command-line-args)))
-    (while args
-      (setcar args
-	      (decode-coding-string (car args) locale-coding-system t))
-      (pop args)))
-
-  (let ((done nil)
-	(args (cdr command-line-args))
-	display-arg)
-
-    ;; Figure out which user's init file to load,
-    ;; either from the environment or from the options.
-    (setq init-file-user (if noninteractive nil (user-login-name)))
-    ;; If user has not done su, use current $HOME to find .emacs.
-    (and init-file-user
-         (equal init-file-user (user-real-login-name))
-	 (setq init-file-user ""))
-
-    ;; Process the command-line args, and delete the arguments
-    ;; processed.  This is consistent with the way main in emacs.c
-    ;; does things.
-    (while (and (not done) args)
-      (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--debug-init")
-                         ("--user") ("--iconic") ("--icon-type") ("--quick")
-			 ("--no-blinking-cursor") ("--basic-display")))
-             (argi (pop args))
-             (orig-argi argi)
-             argval)
-	;; Handle --OPTION=VALUE format.
-	(when (string-match "\\`\\(--[^=]*\\)=" argi)
-	  (setq argval (substring argi (match-end 0))
-                argi (match-string 1 argi)))
-	(when (string-match "\\`--." orig-argi)
-	  (let ((completion (try-completion argi longopts)))
-	    (if (eq completion t)
-		(setq argi (substring argi 1))
-	      (if (stringp completion)
-		  (let ((elt (assoc completion longopts)))
-		    (or elt
-			(error "Option `%s' is ambiguous" argi))
-		    (setq argi (substring (car elt) 1)))
-		(setq argval nil
-                      argi orig-argi)))))
-	(cond
-	 ;; The --display arg is handled partly in C, partly in Lisp.
-	 ;; When it shows up here, we just put it back to be handled
-	 ;; by `command-line-1'.
-	 ((member argi '("-d" "-display"))
-	  (setq display-arg (list argi (pop args))))
-	 ((member argi '("-Q" "-quick"))
-	  (setq init-file-user nil
-		site-run-file nil
-		inhibit-x-resources t))
-	 ((member argi '("-D" "-basic-display"))
-	  (setq no-blinking-cursor t
-		emacs-basic-display t)
-	  (push '(vertical-scroll-bars . nil) initial-frame-alist))
-	 ((member argi '("-q" "-no-init-file"))
-	  (setq init-file-user nil))
-	 ((member argi '("-u" "-user"))
-	  (setq init-file-user (or argval (pop args))
-		argval nil))
-	 ((equal argi "-no-site-file")
-	  (setq site-run-file nil))
-	 ((equal argi "-debug-init")
-	  (setq init-file-debug t))
-	 ((equal argi "-iconic")
-	  (push '(visibility . icon) initial-frame-alist))
-	 ((member argi '("-nbc" "-no-blinking-cursor"))
-	  (setq no-blinking-cursor t))
-	 ;; Push the popped arg back on the list of arguments.
-	 (t
-          (push argi args)
-          (setq done t)))
-	;; Was argval set but not used?
-	(and argval
-	     (error "Option `%s' doesn't allow an argument" argi))))
-
-    ;; Re-attach the --display arg.
-    (and display-arg (setq args (append display-arg args)))
-
-    ;; Re-attach the program name to the front of the arg list.
-    (and command-line-args
-         (setcdr command-line-args args)))
-
-  ;; Make sure window system's init file was loaded in loadup.el if
-  ;; using a window system.
-  ;; Initialize the window-system only after processing the command-line
-  ;; args so that -Q can influence this initialization.
-  (condition-case error
-    (unless noninteractive
-      (if (and initial-window-system
-	       (not (featurep
-		     (intern
-		      (concat (symbol-name initial-window-system) "-win")))))
-	  (error "Unsupported window system `%s'" initial-window-system))
-      ;; Process window-system specific command line parameters.
-      (setq command-line-args
-	    (funcall
-	     (or (cdr (assq initial-window-system handle-args-function-alist))
-		 (error "Unsupported window system `%s'" initial-window-system))
-	     command-line-args))
-      ;; Initialize the window system. (Open connection, etc.)
-      (funcall
-       (or (cdr (assq initial-window-system window-system-initialization-alist))
-	   (error "Unsupported window system `%s'" initial-window-system))))
-    ;; If there was an error, print the error message and exit.
-    (error
-     (princ
-      (if (eq (car error) 'error)
-	  (apply 'concat (cdr error))
-	(if (memq 'file-error (get (car error) 'error-conditions))
-	    (format "%s: %s"
-                    (nth 1 error)
-                    (mapconcat (lambda (obj) (prin1-to-string obj t))
-                               (cdr (cdr error)) ", "))
-	  (format "%s: %s"
-                  (get (car error) 'error-message)
-                  (mapconcat (lambda (obj) (prin1-to-string obj t))
-                             (cdr error) ", "))))
-      'external-debugging-output)
-     (terpri 'external-debugging-output)
-     (setq initial-window-system nil)
-     (kill-emacs)))
-
-  (run-hooks 'before-init-hook)
-
-  ;; Under X Window, this creates the X frame and deletes the terminal frame.
-  (unless (daemonp)
-    (frame-initialize))
-
-  ;; Turn off blinking cursor if so specified in X resources.  This is here
-  ;; only because all other settings of no-blinking-cursor are here.
-  (unless (or noninteractive
-	      emacs-basic-display
-	      (and (memq window-system '(x w32 ns))
-		   (not (member (x-get-resource "cursorBlink" "CursorBlink")
-				'("off" "false")))))
-    (setq no-blinking-cursor t))
-
-  ;; If frame was created with a menu bar, set menu-bar-mode on.
-  (unless (or noninteractive
-	      emacs-basic-display
-              (and (memq initial-window-system '(x w32))
-                   (<= (frame-parameter nil 'menu-bar-lines) 0)))
-    (menu-bar-mode 1))
-
-  (unless (or noninteractive (not (fboundp 'tool-bar-mode)))
-    ;; Set up the tool-bar.  Do this even in tty frames, so that there
-    ;; is a tool-bar if Emacs later opens a graphical frame.
-    (if (or emacs-basic-display
-	    (and (numberp (frame-parameter nil 'tool-bar-lines))
-		 (<= (frame-parameter nil 'tool-bar-lines) 0)))
-	;; On a graphical display with the toolbar disabled via X
-	;; resources, set up the toolbar without enabling it.
-	(tool-bar-setup)
-      ;; Otherwise, enable tool-bar-mode.
-      (tool-bar-mode 1)))
-
-  ;; Re-evaluate predefined variables whose initial value depends on
-  ;; the runtime context.
-  (mapc 'custom-reevaluate-setting
-        ;; Initialize them in the same order they were loaded, in case there
-        ;; are dependencies between them.
-        (prog1 (nreverse custom-delayed-init-variables)
-          (setq custom-delayed-init-variables nil)))
-
-  (normal-erase-is-backspace-setup-frame)
-
-  ;; Register default TTY colors for the case the terminal hasn't a
-  ;; terminal init file.  We do this regardles of whether the terminal
-  ;; supports colors or not and regardless the current display type,
-  ;; since users can connect to color-capable terminals and also
-  ;; switch color support on or off in mid-session by setting the
-  ;; tty-color-mode frame parameter.
-  ;; Exception: the `pc' ``window system'' has only 16 fixed colors,
-  ;; and they are already set at this point by a suitable function in
-  ;; window-system-initialization-alist.
-  (or (eq initial-window-system 'pc)
-      (tty-register-default-colors))
-
-  ;; Record whether the tool-bar is present before the user and site
-  ;; init files are processed.  frame-notice-user-settings uses this
-  ;; to determine if the tool-bar has been disabled by the init files,
-  ;; and the frame needs to be resized.
-  (when (fboundp 'frame-notice-user-settings)
-    (let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
-                              (assq 'tool-bar-lines default-frame-alist))))
-      (setq tool-bar-originally-present
-            (and tool-bar-lines
-                 (cdr tool-bar-lines)
-                 (not (eq 0 (cdr tool-bar-lines)))))))
-
-  (let ((old-scalable-fonts-allowed scalable-fonts-allowed)
-	(old-font-list-limit font-list-limit)
-	(old-face-ignored-fonts face-ignored-fonts))
-
-    ;; Run the site-start library if it exists.  The point of this file is
-    ;; that it is run before .emacs.  There is no point in doing this after
-    ;; .emacs; that is useless.
-    ;; Note that user-init-file is nil at this point.  Code that might
-    ;; be loaded from site-run-file and wants to test if -q was given
-    ;; should check init-file-user instead, since that is already set.
-    ;; See cus-edit.el for an example.
-    (if site-run-file
-	(load site-run-file t t))
-
-    ;; Sites should not disable this.  Only individuals should disable
-    ;; the startup screen.
-    (setq inhibit-startup-screen nil)
-
-    ;; Warn for invalid user name.
-    (when init-file-user
-      (if (string-match "[~/:\n]" init-file-user)
-	  (display-warning 'initialization
-			   (format "Invalid user name %s"
-				   init-file-user)
-			   :error)
-	(if (file-directory-p (expand-file-name
-			       ;; We don't support ~USER on MS-Windows
-			       ;; and MS-DOS except for the current
-			       ;; user, and always load .emacs from
-			       ;; the current user's home directory
-			       ;; (see below).  So always check "~",
-			       ;; even if invoked with "-u USER", or
-			       ;; if $USER or $LOGNAME are set to
-			       ;; something different.
-			       (if (memq system-type '(windows-nt ms-dos))
-				   "~"
-				 (concat "~" init-file-user))))
-	    nil
-	  (display-warning 'initialization
-			   (format "User %s has no home directory"
-				   init-file-user)
-			   :error))))
-
-    ;; Load that user's init file, or the default one, or none.
-    (let (debug-on-error-from-init-file
-	  debug-on-error-should-be-set
-	  (debug-on-error-initial
-	   (if (eq init-file-debug t) 'startup init-file-debug))
-	  (orig-enable-multibyte (default-value 'enable-multibyte-characters)))
-      (let ((debug-on-error debug-on-error-initial)
-	    ;; This function actually reads the init files.
-	    (inner
-	     (function
-	      (lambda ()
-		(if init-file-user
-		    (let ((user-init-file-1
-			   (cond
-			    ((eq system-type 'ms-dos)
-			     (concat "~" init-file-user "/_emacs"))
-			    ((eq system-type 'windows-nt)
-			     ;; Prefer .emacs on Windows.
-			     (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
-				 "~/.emacs"
-			       ;; Also support _emacs for compatibility.
-			       (if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
-				   "~/_emacs"
-				 ;; But default to .emacs if _emacs does not exist.
-				 "~/.emacs")))
-			    (t
-			     (concat "~" init-file-user "/.emacs")))))
-		      ;; This tells `load' to store the file name found
-		      ;; into user-init-file.
-		      (setq user-init-file t)
-		      (load user-init-file-1 t t)
-
-		      (when (eq user-init-file t)
-			;; If we did not find ~/.emacs, try
-			;; ~/.emacs.d/init.el.
-			(let ((otherfile
-			       (expand-file-name
-				"init"
-				(file-name-as-directory
-				 (concat "~" init-file-user "/.emacs.d")))))
-			  (load otherfile t t)
-
-			  ;; If we did not find the user's init file,
-			  ;; set user-init-file conclusively.
-			  ;; Don't let it be set from default.el.
-			  (when (eq user-init-file t)
-			    (setq user-init-file user-init-file-1))))
-
-		      ;; If we loaded a compiled file, set
-		      ;; `user-init-file' to the source version if that
-		      ;; exists.
-		      (when (and user-init-file
-				 (equal (file-name-extension user-init-file)
-					"elc"))
-			(let* ((source (file-name-sans-extension user-init-file))
-			       (alt (concat source ".el")))
-			  (setq source (cond ((file-exists-p alt) alt)
-					     ((file-exists-p source) source)
-					     (t nil)))
-			  (when source
-			    (when (file-newer-than-file-p source user-init-file)
-			      (message "Warning: %s is newer than %s"
-				       source user-init-file)
-			      (sit-for 1))
-			    (setq user-init-file source))))
-
-		      (unless inhibit-default-init
-                        (let ((inhibit-startup-screen nil))
-                          ;; Users are supposed to be told their rights.
-                          ;; (Plus how to get help and how to undo.)
-                          ;; Don't you dare turn this off for anyone
-                          ;; except yourself.
-                          (load "default" t t)))))))))
-	(if init-file-debug
-	    ;; Do this without a condition-case if the user wants to debug.
-	    (funcall inner)
-	  (condition-case error
-	      (progn
-		(funcall inner)
-		(setq init-file-had-error nil))
-	    (error
-	     (display-warning
-	      'initialization
-	      (format "An error occurred while loading `%s':\n\n%s%s%s\n\n\
-To ensure normal operation, you should investigate and remove the
-cause of the error in your initialization file.  Start Emacs with
-the `--debug-init' option to view a complete error backtrace."
-		      user-init-file
-		      (get (car error) 'error-message)
-		      (if (cdr error) ": " "")
-		      (mapconcat (lambda (s) (prin1-to-string s t)) (cdr error) ", "))
-	      :warning)
-	     (setq init-file-had-error t))))
-
-      (if (and deactivate-mark transient-mark-mode)
-	    (with-current-buffer (window-buffer)
-	      (deactivate-mark)))
-
-	;; If the user has a file of abbrevs, read it (unless -batch).
-	(when (and (not noninteractive)
-		   (file-exists-p abbrev-file-name)
-		   (file-readable-p abbrev-file-name))
-	    (quietly-read-abbrev-file abbrev-file-name))
-
-	;; If the abbrevs came entirely from the init file or the
-	;; abbrevs file, they do not need saving.
-	(setq abbrevs-changed nil)
-
-	;; If we can tell that the init file altered debug-on-error,
-	;; arrange to preserve the value that it set up.
-	(or (eq debug-on-error debug-on-error-initial)
-	    (setq debug-on-error-should-be-set t
-		  debug-on-error-from-init-file debug-on-error)))
-      (if debug-on-error-should-be-set
-	  (setq debug-on-error debug-on-error-from-init-file))
-      (unless (or (default-value 'enable-multibyte-characters)
-		  (eq orig-enable-multibyte (default-value
-					      'enable-multibyte-characters)))
-	;; Init file changed to unibyte.  Reset existing multibyte
-	;; buffers (probably *scratch*, *Messages*, *Minibuff-0*).
-	;; Arguably this should only be done if they're free of
-	;; multibyte characters.
-	(mapc (lambda (buffer)
-		(with-current-buffer buffer
-		  (if enable-multibyte-characters
-		      (set-buffer-multibyte nil))))
-	      (buffer-list))
-	;; Also re-set the language environment in case it was
-	;; originally done before unibyte was set and is sensitive to
-	;; unibyte (display table, terminal coding system &c).
-	(set-language-environment current-language-environment)))
-
-    ;; Do this here in case the init file sets mail-host-address.
-    (if (equal user-mail-address "")
-	(setq user-mail-address (or (getenv "EMAIL")
-				    (concat (user-login-name) "@"
-					    (or mail-host-address
-						(system-name))))))
-
-    ;; Originally face attributes were specified via
-    ;; `font-lock-face-attributes'.  Users then changed the default
-    ;; face attributes by setting that variable.  However, we try and
-    ;; be back-compatible and respect its value if set except for
-    ;; faces where M-x customize has been used to save changes for the
-    ;; face.
-    (when (boundp 'font-lock-face-attributes)
-      (let ((face-attributes font-lock-face-attributes))
-	(while face-attributes
-	  (let* ((face-attribute (pop face-attributes))
-		 (face (car face-attribute)))
-	    ;; Rustle up a `defface' SPEC from a
-	    ;; `font-lock-face-attributes' entry.
-	    (unless (get face 'saved-face)
-	      (let ((foreground (nth 1 face-attribute))
-		    (background (nth 2 face-attribute))
-		    (bold-p (nth 3 face-attribute))
-		    (italic-p (nth 4 face-attribute))
-		    (underline-p (nth 5 face-attribute))
-		    face-spec)
-		(when foreground
-		  (setq face-spec (cons ':foreground (cons foreground face-spec))))
-		(when background
-		  (setq face-spec (cons ':background (cons background face-spec))))
-		(when bold-p
-		  (setq face-spec (append '(:weight bold) face-spec)))
-		(when italic-p
-		  (setq face-spec (append '(:slant italic) face-spec)))
-		(when underline-p
-		  (setq face-spec (append '(:underline t) face-spec)))
-		(face-spec-set face (list (list t face-spec)) nil)))))))
-
-    ;; If parameter have been changed in the init file which influence
-    ;; face realization, clear the face cache so that new faces will
-    ;; be realized.
-    (unless (and (eq scalable-fonts-allowed old-scalable-fonts-allowed)
-		 (eq font-list-limit old-font-list-limit)
-		 (eq face-ignored-fonts old-face-ignored-fonts))
-      (clear-face-cache)))
-
-  (setq after-init-time (current-time))
-  (run-hooks 'after-init-hook)
-
-  ;; Decode all default-directory.
-  (if (and (default-value 'enable-multibyte-characters) locale-coding-system)
-      (save-excursion
-	(dolist (elt (buffer-list))
-	  (set-buffer elt)
-	  (if default-directory
-	      (setq default-directory
-		    (decode-coding-string default-directory
-					  locale-coding-system t))))
-	(setq command-line-default-directory
-	      (decode-coding-string command-line-default-directory
-				    locale-coding-system t))))
-
-  ;; If *scratch* exists and init file didn't change its mode, initialize it.
-  (if (get-buffer "*scratch*")
-      (with-current-buffer "*scratch*"
-	(if (eq major-mode 'fundamental-mode)
-	    (funcall initial-major-mode))))
-
-  ;; Load library for our terminal type.
-  ;; User init file can set term-file-prefix to nil to prevent this.
-  (unless (or noninteractive
-              initial-window-system)
-    (tty-run-terminal-initialization (selected-frame)))
-
-  ;; Update the out-of-memory error message based on user's key bindings
-  ;; for save-some-buffers.
-  (setq memory-signal-data
-	(list 'error
-	      (substitute-command-keys "Memory exhausted--use \\[save-some-buffers] then exit and restart Emacs")))
-
-  ;; Process the remaining args.
-  (command-line-1 (cdr command-line-args))
-
-  ;; If -batch, terminate after processing the command options.
-  (if noninteractive (kill-emacs t))
-
-  ;; In daemon mode, start the server to allow clients to connect.
-  ;; This is done after loading the user's init file and after
-  ;; processing all command line arguments to allow e.g. `server-name'
-  ;; to be changed before the server starts.
-  (let ((dn (daemonp)))
-    (when dn
-      (when (stringp dn) (setq server-name dn))
-      (server-start)
-      (if server-process
-	  (daemon-initialized)
-	(if (stringp dn)
-	    (message
-	     "Unable to start daemon: Emacs server named %S already running"
-	     server-name)
-	  (message "Unable to start the daemon.\nAnother instance of Emacs is running the server, either as daemon or interactively.\nYou can use emacsclient to connect to that Emacs process."))
-	(kill-emacs 1))))
-
-  ;; Run emacs-session-restore (session management) if started by
-  ;; the session manager and we have a session manager connection.
-  (if (and (boundp 'x-session-previous-id)
-           (stringp x-session-previous-id))
-      (with-no-warnings
-	(emacs-session-restore x-session-previous-id))))
-
-(defcustom initial-scratch-message (purecopy "\
-;; This buffer is for notes you don't want to save, and for Lisp evaluation.
-;; If you want to create a file, visit that file with C-x C-f,
-;; then enter the text in that file's own buffer.
-
-")
-  "Initial message displayed in *scratch* buffer at startup.
-If this is nil, no message will be displayed."
-  :type '(choice (text :tag "Message")
-		 (const :tag "none" nil))
-  :group 'initialization)
-
-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Fancy splash screen
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defconst fancy-startup-text
-  '((:face (variable-pitch (:foreground "red"))
-     "Welcome to "
-     :link ("GNU Emacs"
-	    (lambda (button) (browse-url "http://www.gnu.org/software/emacs/"))
-	    "Browse http://www.gnu.org/software/emacs/")
-     ", one component of the "
-     :link
-     (lambda ()
-       (if (eq system-type 'gnu/linux)
-	   '("GNU/Linux"
-	     (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))
-	     "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
-	 '("GNU" (lambda (button) (describe-gnu-project))
-	   "Display info on the GNU project")))
-     " operating system.\n\n"
-     :face variable-pitch
-     :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial)))
-     "\tLearn basic keystroke commands"
-     (lambda ()
-       (let* ((en "TUTORIAL")
-	      (tut (or (get-language-info current-language-environment
-					  'tutorial)
-		       en))
-	      (title (with-temp-buffer
-		       (insert-file-contents
-			(expand-file-name tut tutorial-directory)
-			nil 0 256)
-		       (search-forward ".")
-		       (buffer-substring (point-min) (1- (point))))))
-	 ;; If there is a specific tutorial for the current language
-	 ;; environment and it is not English, append its title.
-	 (if (string= en tut)
-	     ""
-	   (concat " (" title ")"))))
-     "\n"
-     :link ("Emacs Guided Tour"
-	    (lambda (button) (browse-url "http://www.gnu.org/software/emacs/tour/"))
-	    "Browse http://www.gnu.org/software/emacs/tour/")
-     "\tOverview of Emacs features at gnu.org\n"
-     :link ("View Emacs Manual" (lambda (button) (info-emacs-manual)))
-     "\tView the Emacs manual using Info\n"
-     :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
-     "\tGNU Emacs comes with "
-     :face (variable-pitch (:slant oblique))
-     "ABSOLUTELY NO WARRANTY\n"
-     :face variable-pitch
-     :link ("Copying Conditions" (lambda (button) (describe-copying)))
-     "\tConditions for redistributing and changing Emacs\n"
-     :link ("Ordering Manuals" (lambda (button) (view-order-manuals)))
-     "\tPurchasing printed copies of manuals\n"
-     "\n"))
-  "A list of texts to show in the middle part of splash screens.
-Each element in the list should be a list of strings or pairs
-`:face FACE', like `fancy-splash-insert' accepts them.")
-
-(defconst fancy-about-text
-  '((:face (variable-pitch (:foreground "red"))
-     "This is "
-     :link ("GNU Emacs"
-	    (lambda (button) (browse-url "http://www.gnu.org/software/emacs/"))
-	    "Browse http://www.gnu.org/software/emacs/")
-     ", one component of the "
-     :link
-     (lambda ()
-       (if (eq system-type 'gnu/linux)
-	   '("GNU/Linux"
-	     (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))
-	     "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
-	 '("GNU" (lambda (button) (describe-gnu-project))
-	   "Display info on the GNU project.")))
-     " operating system.\n"
-     :face (lambda ()
-	     (list 'variable-pitch
-		   (list :foreground
-			 (if (eq (frame-parameter nil 'background-mode) 'dark)
-			     "cyan" "darkblue"))))
-     "\n"
-     (lambda () (emacs-version))
-     "\n"
-     :face (variable-pitch (:height 0.8))
-     (lambda () emacs-copyright)
-     "\n\n"
-     :face variable-pitch
-     :link ("Authors"
-	    (lambda (button)
-	      (view-file (expand-file-name "AUTHORS" data-directory))
-	      (goto-char (point-min))))
-     "\tMany people have contributed code included in GNU Emacs\n"
-     :link ("Contributing"
-	    (lambda (button)
-	      (view-file (expand-file-name "CONTRIBUTE" data-directory))
-	      (goto-char (point-min))))
-     "\tHow to contribute improvements to Emacs\n"
-     "\n"
-     :link ("GNU and Freedom" (lambda (button) (describe-gnu-project)))
-     "\tWhy we developed GNU Emacs, and the GNU operating system\n"
-     :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
-     "\tGNU Emacs comes with "
-     :face (variable-pitch (:slant oblique))
-     "ABSOLUTELY NO WARRANTY\n"
-     :face variable-pitch
-     :link ("Copying Conditions" (lambda (button) (describe-copying)))
-     "\tConditions for redistributing and changing Emacs\n"
-     :link ("Getting New Versions" (lambda (button) (describe-distribution)))
-     "\tHow to obtain the latest version of Emacs\n"
-     :link ("Ordering Manuals" (lambda (button) (view-order-manuals)))
-     "\tBuying printed manuals from the FSF\n"
-     "\n"
-     :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial)))
-     "\tLearn basic Emacs keystroke commands"
-     (lambda ()
-       (let* ((en "TUTORIAL")
-	      (tut (or (get-language-info current-language-environment
-					  'tutorial)
-		       en))
-	      (title (with-temp-buffer
-		       (insert-file-contents
-			(expand-file-name tut tutorial-directory)
-			nil 0 256)
-		       (search-forward ".")
-		       (buffer-substring (point-min) (1- (point))))))
-	 ;; If there is a specific tutorial for the current language
-	 ;; environment and it is not English, append its title.
-	 (if (string= en tut)
-	     ""
-	   (concat " (" title ")"))))
-     "\n"
-     :link ("Emacs Guided Tour"
-	    (lambda (button) (browse-url "http://www.gnu.org/software/emacs/tour/"))
-	    "Browse http://www.gnu.org/software/emacs/tour/")
-     "\tSee an overview of Emacs features at gnu.org"
-     ))
-  "A list of texts to show in the middle part of the About screen.
-Each element in the list should be a list of strings or pairs
-`:face FACE', like `fancy-splash-insert' accepts them.")
-
-
-(defgroup fancy-splash-screen ()
-  "Fancy splash screen when Emacs starts."
-  :version "21.1"
-  :group 'initialization)
-
-(defcustom fancy-splash-image nil
-  "The image to show in the splash screens, or nil for defaults."
-  :group 'fancy-splash-screen
-  :type '(choice (const :tag "Default" nil)
-		 (file :tag "File")))
-
-
-(defvar splash-screen-keymap
-  (let ((map (make-sparse-keymap)))
-    (suppress-keymap map)
-    (set-keymap-parent map button-buffer-map)
-    (define-key map "\C-?" 'scroll-down)
-    (define-key map " " 'scroll-up)
-    (define-key map "q" 'exit-splash-screen)
-    map)
-  "Keymap for splash screen buffer.")
-
-;; These are temporary storage areas for the splash screen display.
-
-(defun fancy-splash-insert (&rest args)
-  "Insert text into the current buffer, with faces.
-Arguments from ARGS should be either strings; functions called
-with no args that return a string; pairs `:face FACE', where FACE
-is a face specification usable with `put-text-property'; or pairs
-`:link LINK' where LINK is a list of arguments to pass to
-`insert-button', of the form (LABEL ACTION [HELP-ECHO]), which
-specifies the button's label, `action' property and help-echo string.
-FACE and LINK can also be functions, which are evaluated to obtain
-a face or button specification."
-  (let ((current-face nil))
-    (while args
-      (cond ((eq (car args) :face)
-	     (setq args (cdr args) current-face (car args))
-	     (if (functionp current-face)
-		 (setq current-face (funcall current-face))))
-	    ((eq (car args) :link)
-	     (setq args (cdr args))
-	     (let ((spec (car args)))
-	       (if (functionp spec)
-		   (setq spec (funcall spec)))
-	       (insert-button (car spec)
-			      'face (list 'link current-face)
-			      'action (cadr spec)
-			      'help-echo (concat "mouse-2, RET: "
-						 (or (nth 2 spec)
-						     "Follow this link"))
-			      'follow-link t)))
-	    (t (insert (propertize (let ((it (car args)))
-				     (if (functionp it)
-					 (funcall it)
-				       it))
-				   'face current-face
-				   'help-echo (startup-echo-area-message)))))
-      (setq args (cdr args)))))
-
-(declare-function image-size "image.c" (spec &optional pixels frame))
-
-(defun fancy-splash-head ()
-  "Insert the head part of the splash screen into the current buffer."
-  (let* ((image-file (cond ((stringp fancy-splash-image)
-			    fancy-splash-image)
-			   ((display-color-p)
-			    (cond ((<= (display-planes) 8)
-				   (if (image-type-available-p 'xpm)
-				       "splash.xpm"
-				     "splash.pbm"))
-				  ((image-type-available-p 'svg)
-				   "splash.svg")
-				  ((image-type-available-p 'png)
-				   "splash.png")
-				  ((image-type-available-p 'xpm)
-				   "splash.xpm")
-				  (t "splash.pbm")))
-			   (t "splash.pbm")))
-	 (img (create-image image-file))
-	 (image-width (and img (car (image-size img))))
-	 (window-width (window-width (selected-window))))
-    (when img
-      (when (> window-width image-width)
-	;; Center the image in the window.
-	(insert (propertize " " 'display
-			    `(space :align-to (+ center (-0.5 . ,img)))))
-
-	;; Change the color of the XPM version of the splash image
-	;; so that it is visible with a dark frame background.
-	(when (and (memq 'xpm img)
-		   (eq (frame-parameter nil 'background-mode) 'dark))
-	  (setq img (append img '(:color-symbols (("#000000" . "gray30"))))))
-
-	;; Insert the image with a help-echo and a link.
-	(make-button (prog1 (point) (insert-image img)) (point)
-		     'face 'default
-		     'help-echo "mouse-2, RET: Browse http://www.gnu.org/"
-		     'action (lambda (button) (browse-url "http://www.gnu.org/"))
-		     'follow-link t)
-	(insert "\n\n")))))
-
-(defun fancy-startup-tail (&optional concise)
-  "Insert the tail part of the splash screen into the current buffer."
-  (let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark)
-		"cyan" "darkblue")))
-    (unless concise
-      (fancy-splash-insert
-       :face 'variable-pitch
-       "\nTo start...     "
-       :link '("Open a File"
-	       (lambda (button) (call-interactively 'find-file))
-	       "Specify a new file's name, to edit the file")
-       "     "
-       :link '("Open Home Directory"
-	       (lambda (button) (dired "~"))
-	       "Open your home directory, to operate on its files")
-       "     "
-       :link '("Customize Startup"
-	       (lambda (button) (customize-group 'initialization))
-	       "Change initialization settings including this screen")
-       "\n"))
-    (fancy-splash-insert
-     :face 'variable-pitch "To quit a partially entered command, type "
-     :face 'default "Control-g"
-     :face 'variable-pitch ".\n")
-    (fancy-splash-insert :face `(variable-pitch (:foreground ,fg))
-			 "\nThis is "
-			 (emacs-version)
-			 "\n"
-			 :face '(variable-pitch (:height 0.8))
-			 emacs-copyright
-			 "\n")
-    (and auto-save-list-file-prefix
-	 ;; Don't signal an error if the
-	 ;; directory for auto-save-list files
-	 ;; does not yet exist.
-	 (file-directory-p (file-name-directory
-			    auto-save-list-file-prefix))
-	 (directory-files
-	  (file-name-directory auto-save-list-file-prefix)
-	  nil
-	  (concat "\\`"
-		  (regexp-quote (file-name-nondirectory
-				 auto-save-list-file-prefix)))
-	  t)
-	 (fancy-splash-insert :face '(variable-pitch (:foreground "red"))
-			      "\nIf an Emacs session crashed recently, "
-			      "type "
-			      :face '(fixed-pitch :foreground "red")
-			      "Meta-x recover-session RET"
-			      :face '(variable-pitch (:foreground "red"))
-			      "\nto recover"
-			      " the files you were editing."))
-
-    (when concise
-      (fancy-splash-insert
-       :face 'variable-pitch "\n"
-       :link '("Dismiss this startup screen"
-	       (lambda (button)
-		 (when startup-screen-inhibit-startup-screen
-		   (customize-set-variable 'inhibit-startup-screen t)
-		   (customize-mark-to-save 'inhibit-startup-screen)
-		   (custom-save-all))
-		 (let ((w (get-buffer-window "*GNU Emacs*")))
-		   (and w (not (one-window-p)) (delete-window w)))
-		 (kill-buffer "*GNU Emacs*")))
-       "  ")
-      (when (or user-init-file custom-file)
-	(let ((checked (create-image "\300\300\141\143\067\076\034\030"
-				     'xbm t :width 8 :height 8 :background "grey75"
-				     :foreground "black" :relief -2 :ascent 'center))
-	      (unchecked (create-image (make-string 8 0)
-				       'xbm t :width 8 :height 8 :background "grey75"
-				       :foreground "black" :relief -2 :ascent 'center)))
-	  (insert-button
-	   " " :on-glyph checked :off-glyph unchecked 'checked nil
-	   'display unchecked 'follow-link t
-	   'action (lambda (button)
-		     (if (overlay-get button 'checked)
-			 (progn (overlay-put button 'checked nil)
-				(overlay-put button 'display (overlay-get button :off-glyph))
-				(setq startup-screen-inhibit-startup-screen nil))
-		       (overlay-put button 'checked t)
-		       (overlay-put button 'display (overlay-get button :on-glyph))
-		       (setq startup-screen-inhibit-startup-screen t)))))
-	(fancy-splash-insert :face '(variable-pitch (:height 0.9))
-			     " Never show it again.")))))
-
-(defun exit-splash-screen ()
-  "Stop displaying the splash screen buffer."
-  (interactive)
-  (quit-window t))
-
-(defun fancy-startup-screen (&optional concise)
-  "Display fancy startup screen.
-If CONCISE is non-nil, display a concise version of the
-splash screen in another window."
-  (let ((splash-buffer (get-buffer-create "*GNU Emacs*")))
-    (with-current-buffer splash-buffer
-      (let ((inhibit-read-only t))
-	(erase-buffer)
-	(setq default-directory command-line-default-directory)
-	(make-local-variable 'startup-screen-inhibit-startup-screen)
-	(if pure-space-overflow
-	    (insert pure-space-overflow-message))
-	(unless concise
-	  (fancy-splash-head))
-	(dolist (text fancy-startup-text)
-	  (apply #'fancy-splash-insert text)
-	  (insert "\n"))
-	(skip-chars-backward "\n")
-	(delete-region (point) (point-max))
-	(insert "\n")
-	(fancy-startup-tail concise))
-      (use-local-map splash-screen-keymap)
-      (setq tab-width 22
-	    buffer-read-only t)
-      (set-buffer-modified-p nil)
-      (if (and view-read-only (not view-mode))
-	  (view-mode-enter nil 'kill-buffer))
-      (goto-char (point-min))
-      (forward-line (if concise 2 4)))
-    (if concise
-	(progn
-	  (display-buffer splash-buffer)
-	  ;; If the splash screen is in a split window, fit it.
-	  (let ((window (get-buffer-window splash-buffer t)))
-	    (or (null window)
-		(eq window (selected-window))
-		(eq window (next-window window))
-		(fit-window-to-buffer window))))
-      (switch-to-buffer splash-buffer))))
-
-(defun fancy-about-screen ()
-  "Display fancy About screen."
-  (let ((frame (fancy-splash-frame)))
-    (save-selected-window
-      (select-frame frame)
-      (switch-to-buffer "*About GNU Emacs*")
-      (setq buffer-undo-list t
-	    mode-line-format
-	    (concat "----"
-		    (propertize "%b" 'face 'mode-line-buffer-id)
-		    "%-"))
-      (let ((inhibit-read-only t))
-	(erase-buffer)
-	(if pure-space-overflow
-	    (insert pure-space-overflow-message))
-	(fancy-splash-head)
-	(dolist (text fancy-about-text)
-	  (apply #'fancy-splash-insert text)
-	  (insert "\n"))
-	(set-buffer-modified-p nil)
-	(goto-char (point-min))
-	(force-mode-line-update))
-      (use-local-map splash-screen-keymap)
-      (setq tab-width 22)
-      (message "%s" (startup-echo-area-message))
-      (setq buffer-read-only t)
-      (goto-char (point-min))
-      (forward-line 3))))
-
-(defun fancy-splash-frame ()
-  "Return the frame to use for the fancy splash screen.
-Returning non-nil does not mean we should necessarily
-use the fancy splash screen, but if we do use it,
-we put it on this frame."
-  (let (chosen-frame)
-    (dolist (frame (append (frame-list) (list (selected-frame))))
-      (if (and (frame-visible-p frame)
-	       (not (window-minibuffer-p (frame-selected-window frame))))
-	  (setq chosen-frame frame)))
-    chosen-frame))
-
-(defun use-fancy-splash-screens-p ()
-  "Return t if fancy splash screens should be used."
-  (when (and (display-graphic-p)
-             (or (and (display-color-p)
-		 (image-type-available-p 'xpm))
-                 (image-type-available-p 'pbm)))
-    (let ((frame (fancy-splash-frame)))
-      (when frame
-	(let* ((img (create-image (or fancy-splash-image
-				      (if (and (display-color-p)
-					       (image-type-available-p 'xpm))
-					  "splash.xpm" "splash.pbm"))))
-	       (image-height (and img (cdr (image-size img nil frame))))
-	       ;; We test frame-height so that, if the frame is split
-	       ;; by displaying a warning, that doesn't cause the normal
-	       ;; splash screen to be used.
-	       (frame-height (1- (frame-height frame))))
-	  (> frame-height (+ image-height 19)))))))
-
-
-(defun normal-splash-screen (&optional startup concise)
-  "Display non-graphic splash screen.
-If optional argument STARTUP is non-nil, display the startup screen
-after Emacs starts.  If STARTUP is nil, display the About screen.
-If CONCISE is non-nil, display a concise version of the
-splash screen in another window."
-  (let ((splash-buffer (get-buffer-create "*About GNU Emacs*")))
-    (with-current-buffer splash-buffer
-      (setq buffer-read-only nil)
-      (erase-buffer)
-      (setq default-directory command-line-default-directory)
-      (set (make-local-variable 'tab-width) 8)
-      (if (not startup)
-	  (set (make-local-variable 'mode-line-format)
-	       (propertize "---- %b %-" 'face 'mode-line-buffer-id)))
-
-      (if pure-space-overflow
-	  (insert pure-space-overflow-message))
-
-      ;; The convention for this piece of code is that
-      ;; each piece of output starts with one or two newlines
-      ;; and does not end with any newlines.
-      (insert (if startup "Welcome to GNU Emacs" "This is GNU Emacs"))
-      (insert
-       (if (eq system-type 'gnu/linux)
-	   ", one component of the GNU/Linux operating system.\n"
-	 ", a part of the GNU operating system.\n"))
-
-      (if startup
-	  (if (display-mouse-p)
-	      ;; The user can use the mouse to activate menus
-	      ;; so give help in terms of menu items.
-	      (normal-mouse-startup-screen)
-
-	    ;; No mouse menus, so give help using kbd commands.
-	    (normal-no-mouse-startup-screen))
-
-	(normal-about-screen))
-
-      ;; The rest of the startup screen is the same on all
-      ;; kinds of terminals.
-
-      ;; Give information on recovering, if there was a crash.
-      (and startup
-	   auto-save-list-file-prefix
-	   ;; Don't signal an error if the
-	   ;; directory for auto-save-list files
-	   ;; does not yet exist.
-	   (file-directory-p (file-name-directory
-			      auto-save-list-file-prefix))
-	   (directory-files
-	    (file-name-directory auto-save-list-file-prefix)
-	    nil
-	    (concat "\\`"
-		    (regexp-quote (file-name-nondirectory
-				   auto-save-list-file-prefix)))
-	    t)
-	   (insert "\n\nIf an Emacs session crashed recently, "
-		   "type Meta-x recover-session RET\nto recover"
-		   " the files you were editing.\n"))
-
-      (use-local-map splash-screen-keymap)
-
-      ;; Display the input that we set up in the buffer.
-      (set-buffer-modified-p nil)
-      (setq buffer-read-only t)
-      (if (and view-read-only (not view-mode))
-	  (view-mode-enter nil 'kill-buffer))
-      (if startup (rename-buffer "*GNU Emacs*" t))
-      (goto-char (point-min)))
-    (if concise
-	(display-buffer splash-buffer)
-      (switch-to-buffer splash-buffer))))
-
-(defun normal-mouse-startup-screen ()
-  ;; The user can use the mouse to activate menus
-  ;; so give help in terms of menu items.
-  (insert "\
-To follow a link, click Mouse-1 on it, or move to it and type RET.
-To quit a partially entered command, type Control-g.\n")
-
-  (insert "\nImportant Help menu items:\n")
-  (insert-button "Emacs Tutorial"
-		 'action (lambda (button) (help-with-tutorial))
-		 'follow-link t)
-  (insert "\t\tLearn basic Emacs keystroke commands\n")
-  (insert-button "Read the Emacs Manual"
-		 'action (lambda (button) (info-emacs-manual))
-		 'follow-link t)
-  (insert "\tView the Emacs manual using Info\n")
-  (insert-button "\(Non)Warranty"
-		 'action (lambda (button) (describe-no-warranty))
-		 'follow-link t)
-  (insert "\t\tGNU Emacs comes with ABSOLUTELY NO WARRANTY\n")
-  (insert-button "Copying Conditions"
-		 'action (lambda (button) (describe-copying))
-		 'follow-link t)
-  (insert "\tConditions for redistributing and changing Emacs\n")
-  (insert-button "More Manuals / Ordering Manuals"
-		 'action (lambda (button) (view-order-manuals))
-		 'follow-link t)
-  (insert "  How to order printed manuals from the FSF\n")
-
-  (insert "\nUseful tasks:\n")
-  (insert-button "Visit New File"
-		 'action (lambda (button) (call-interactively 'find-file))
-		 'follow-link t)
-  (insert "\t\tSpecify a new file's name, to edit the file\n")
-  (insert-button "Open Home Directory"
-		 'action (lambda (button) (dired "~"))
-		 'follow-link t)
-  (insert "\tOpen your home directory, to operate on its files\n")
-  (insert-button "Customize Startup"
-		 'action (lambda (button) (customize-group 'initialization))
-		 'follow-link t)
-  (insert "\tChange initialization settings including this screen\n")
-
-  (insert "\n" (emacs-version)
-	  "\n" emacs-copyright))
-
-;; No mouse menus, so give help using kbd commands.
-(defun normal-no-mouse-startup-screen ()
-
-  ;; If keys have their default meanings,
-  ;; use precomputed string to save lots of time.
-  (let* ((c-h-accessible
-          ;; If normal-erase-is-backspace is used on a tty, there's
-          ;; no way to invoke C-h and you have to use F1 instead.
-          (or (not (char-table-p keyboard-translate-table))
-              (eq (aref keyboard-translate-table ?\C-h) ?\C-h)))
-         (minor-mode-overriding-map-alist
-          (cons (cons (not c-h-accessible)
-                      ;; If C-h can't be invoked, temporarily disable its
-                      ;; binding, so where-is uses alternative bindings.
-                      (let ((map (make-sparse-keymap)))
-                        (define-key map [?\C-h] 'undefined)
-                        map))
-                minor-mode-overriding-map-alist)))
-
-    (insert (format "\nGet help\t   %s\n"
-                    (let ((where (where-is-internal 'help-command nil t)))
-                      (cond
-                       ((equal where [?\C-h])
-                        "C-h  (Hold down CTRL and press h)")
-                       (where (key-description where))
-                       (t "M-x help")))))
-    (insert-button "Emacs manual"
-                   'action (lambda (button) (info-emacs-manual))
-                   'follow-link t)
-    (insert (substitute-command-keys"\t   \\[info-emacs-manual]\t"))
-    (insert-button "Browse manuals"
-                   'action (lambda (button) (Info-directory))
-                   'follow-link t)
-    (insert (substitute-command-keys "\t   \\[info]\n"))
-    (insert-button "Emacs tutorial"
-                   'action (lambda (button) (help-with-tutorial))
-                   'follow-link t)
-    (insert (substitute-command-keys
-             "\t   \\[help-with-tutorial]\tUndo changes\t   \\[undo]\n"))
-    (insert-button "Buy manuals"
-                   'action (lambda (button) (view-order-manuals))
-                   'follow-link t)
-    (insert (substitute-command-keys
-             "\t   \\[view-order-manuals]\tExit Emacs\t   \\[save-buffers-kill-terminal]")))
-
-  ;; Say how to use the menu bar with the keyboard.
-  (insert "\n")
-  (insert-button "Activate menubar"
-		 'action (lambda (button) (tmm-menubar))
-		 'follow-link t)
-  (if (and (eq (key-binding "\M-`") 'tmm-menubar)
-	   (eq (key-binding [f10]) 'tmm-menubar))
-      (insert "   F10  or  ESC `  or   M-`")
-    (insert (substitute-command-keys "   \\[tmm-menubar]")))
-
-  ;; Many users seem to have problems with these.
-  (insert "
-\(`C-' means use the CTRL key.  `M-' means use the Meta (or Alt) key.
-If you have no Meta key, you may instead type ESC followed by the character.)")
-
-  ;; Insert links to useful tasks
-  (insert "\nUseful tasks:\n")
-
-  (insert-button "Visit New File"
-		 'action (lambda (button) (call-interactively 'find-file))
-		 'follow-link t)
-  (insert "\t\t\t")
-  (insert-button "Open Home Directory"
-		 'action (lambda (button) (dired "~"))
-		 'follow-link t)
-  (insert "\n")
-
-  (insert-button "Customize Startup"
-		 'action (lambda (button) (customize-group 'initialization))
-		 'follow-link t)
-  (insert "\t\t")
-  (insert-button "Open *scratch* buffer"
-		 'action (lambda (button) (switch-to-buffer
-					   (get-buffer-create "*scratch*")))
-		 'follow-link t)
-  (insert "\n")
-  (insert "\n" (emacs-version) "\n" emacs-copyright "\n")
-
-  (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
-	   (eq (key-binding "\C-h\C-d") 'describe-distribution)
-	   (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
-      (progn
-	(insert
-	 "
-GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for ")
-	(insert-button "full details"
-		       'action (lambda (button) (describe-no-warranty))
-		       'follow-link t)
-	(insert ".
-Emacs is Free Software--Free as in Freedom--so you can redistribute copies
-of Emacs and modify it; type C-h C-c to see ")
-	(insert-button "the conditions"
-		       'action (lambda (button) (describe-copying))
-		       'follow-link t)
-	(insert ".
-Type C-h C-d for information on ")
-	(insert-button "getting the latest version"
-		       'action (lambda (button) (describe-distribution))
-		       'follow-link t)
-	(insert "."))
-    (insert (substitute-command-keys
-	     "
-GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for "))
-    (insert-button "full details"
-		   'action (lambda (button) (describe-no-warranty))
-		   'follow-link t)
-    (insert (substitute-command-keys ".
-Emacs is Free Software--Free as in Freedom--so you can redistribute copies
-of Emacs and modify it; type \\[describe-copying] to see "))
-    (insert-button "the conditions"
-		   'action (lambda (button) (describe-copying))
-		   'follow-link t)
-    (insert (substitute-command-keys".
-Type \\[describe-distribution] for information on "))
-    (insert-button "getting the latest version"
-		   'action (lambda (button) (describe-distribution))
-		   'follow-link t)
-    (insert ".")))
-
-(defun normal-about-screen ()
-  (insert "\n" (emacs-version) "\n" emacs-copyright "\n\n")
-
-  (insert "To follow a link, click Mouse-1 on it, or move to it and type RET.\n\n")
-
-  (insert-button "Authors"
-		 'action
-		 (lambda (button)
-		   (view-file (expand-file-name "AUTHORS" data-directory))
-		   (goto-char (point-min)))
-		 'follow-link t)
-  (insert "\t\tMany people have contributed code included in GNU Emacs\n")
-
-  (insert-button "Contributing"
-		 'action
-		 (lambda (button)
-		   (view-file (expand-file-name "CONTRIBUTE" data-directory))
-		   (goto-char (point-min)))
-		 'follow-link t)
-  (insert "\tHow to contribute improvements to Emacs\n\n")
-
-  (insert-button "GNU and Freedom"
-		 'action (lambda (button) (describe-gnu-project))
-		 'follow-link t)
-  (insert "\t\tWhy we developed GNU Emacs and the GNU system\n")
-
-  (insert-button "Absence of Warranty"
-		 'action (lambda (button) (describe-no-warranty))
-		 'follow-link t)
-  (insert "\tGNU Emacs comes with ABSOLUTELY NO WARRANTY\n")
-
-  (insert-button "Copying Conditions"
-		 'action (lambda (button) (describe-copying))
-		 'follow-link t)
-  (insert "\tConditions for redistributing and changing Emacs\n")
-
-  (insert-button "Getting New Versions"
-		 'action (lambda (button) (describe-distribution))
-		 'follow-link t)
-  (insert "\tHow to get the latest version of GNU Emacs\n")
-
-  (insert-button "More Manuals / Ordering Manuals"
-		 'action (lambda (button) (view-order-manuals))
-		 'follow-link t)
-  (insert "\tBuying printed manuals from the FSF\n"))
-
-(defun startup-echo-area-message ()
-  (cond ((daemonp)
-	 "Starting Emacs daemon.")
-	((eq (key-binding "\C-h\C-a") 'about-emacs)
-	 "For information about GNU Emacs and the GNU system, type C-h C-a.")
-	(t
-	 (substitute-command-keys
-	  "For information about GNU Emacs and the GNU system, type \
-\\[about-emacs]."))))
-
-(defun display-startup-echo-area-message ()
-  (let ((resize-mini-windows t))
-    (or noninteractive ;(input-pending-p) init-file-had-error
-	;; t if the init file says to inhibit the echo area startup message.
-	(and inhibit-startup-echo-area-message
-	     user-init-file
-	     (or (and (get 'inhibit-startup-echo-area-message 'saved-value)
-		      (equal inhibit-startup-echo-area-message
-			     (if (equal init-file-user "")
-				 (user-login-name)
-			       init-file-user)))
-		 ;; Wasn't set with custom; see if .emacs has a setq.
-		 (let ((buffer (get-buffer-create " *temp*")))
-		   (prog1
-		       (condition-case nil
-			   (with-current-buffer buffer
-			     (insert-file-contents user-init-file)
-			     (re-search-forward
-			      (concat
-			       "([ \t\n]*setq[ \t\n]+"
-			       "inhibit-startup-echo-area-message[ \t\n]+"
-			       (regexp-quote
-				(prin1-to-string
-				 (if (equal init-file-user "")
-				     (user-login-name)
-				   init-file-user)))
-			       "[ \t\n]*)")
-			      nil t))
-			 (error nil))
-		     (kill-buffer buffer)))))
-	(message "%s" (startup-echo-area-message)))))
-
-(defun display-startup-screen (&optional concise)
-  "Display startup screen according to display.
-A fancy display is used on graphic displays, normal otherwise.
-
-If CONCISE is non-nil, display a concise version of the startup
-screen."
-  ;; Prevent recursive calls from server-process-filter.
-  (if (not (get-buffer "*GNU Emacs*"))
-      (if (use-fancy-splash-screens-p)
-      	  (fancy-startup-screen concise)
-      	(normal-splash-screen t concise))))
-
-(defun display-about-screen ()
-  "Display the *About GNU Emacs* buffer.
-A fancy display is used on graphic displays, normal otherwise."
-  (interactive)
-  (if (use-fancy-splash-screens-p)
-      (fancy-about-screen)
-    (normal-splash-screen nil)))
-
-(defalias 'about-emacs 'display-about-screen)
-(defalias 'display-splash-screen 'display-startup-screen)
-
-(defun command-line-1 (command-line-args-left)
-  (display-startup-echo-area-message)
-  (when (and pure-space-overflow
-	     (not noninteractive))
-    (display-warning
-     'initialization
-     "Building Emacs overflowed pure space.\
-  (See the node Pure Storage in the Lisp manual for details.)"
-     :warning))
-
-  (let ((file-count 0)
-	first-file-buffer)
-    (when command-line-args-left
-      ;; We have command args; process them.
-      ;; Note that any local variables in this function affect the
-      ;; ability of -f batch-byte-compile to detect free variables.
-      ;; So we give some of them with common names a cl1- prefix.
-      (let ((cl1-dir command-line-default-directory)
-	    cl1-tem
-	    ;; This approach loses for "-batch -L DIR --eval "(require foo)",
-	    ;; if foo is intended to be found in DIR.
-	    ;;
-	    ;; ;; The directories listed in --directory/-L options will *appear*
-	    ;; ;; at the front of `load-path' in the order they appear on the
-	    ;; ;; command-line.  We cannot do this by *placing* them at the front
-	    ;; ;; in the order they appear, so we need this variable to hold them,
-	    ;; ;; temporarily.
-	    ;; extra-load-path
-	    ;;
-	    ;; To DTRT we keep track of the splice point and modify `load-path'
-	    ;; straight away upon any --directory/-L option.
-	    splice
-	    just-files ;; t if this follows the magic -- option.
-	    ;; This includes our standard options' long versions
-	    ;; and long versions of what's on command-switch-alist.
-	    (longopts
-           (append '("--funcall" "--load" "--insert" "--kill"
-                     "--directory" "--eval" "--execute" "--no-splash"
-                     "--find-file" "--visit" "--file" "--no-desktop")
-                   (mapcar (lambda (elt) (concat "-" (car elt)))
-			     command-switch-alist)))
-	    (cl1-line 0)
-	    (cl1-column 0))
-
-	;; Add the long X options to longopts.
-	(dolist (tem command-line-x-option-alist)
-	  (if (string-match "^--" (car tem))
-            (push (car tem) longopts)))
-
-	;; Add the long NS options to longopts.
-	(dolist (tem command-line-ns-option-alist)
-	  (if (string-match "^--" (car tem))
-	      (push (list (car tem)) longopts)))
-
-	;; Loop, processing options.
-	(while command-line-args-left
-	  (let* ((argi (car command-line-args-left))
-		 (orig-argi argi)
-		 argval completion)
-	    (setq command-line-args-left (cdr command-line-args-left))
-
-	    ;; Do preliminary decoding of the option.
-	    (if just-files
-		;; After --, don't look for options; treat all args as files.
-		(setq argi "")
-	      ;; Convert long options to ordinary options
-	      ;; and separate out an attached option argument into argval.
-	      (when (string-match "\\`\\(--[^=]*\\)=" argi)
-		(setq argval (substring argi (match-end 0))
-		      argi (match-string 1 argi)))
-	      (when (string-match "\\`--?[^-]" orig-argi)
-		(setq completion (try-completion argi longopts))
-		(if (eq completion t)
-		    (setq argi (substring argi 1))
-		  (if (stringp completion)
-                  (let ((elt (member completion longopts)))
-			(or elt
-			    (error "Option `%s' is ambiguous" argi))
-			(setq argi (substring (car elt) 1)))
-		    (setq argval nil
-			  argi orig-argi)))))
-
-	    ;; Execute the option.
-	    (cond ((setq cl1-tem (assoc argi command-switch-alist))
-		   (if argval
-		       (let ((command-line-args-left
-			      (cons argval command-line-args-left)))
-			 (funcall (cdr cl1-tem) argi))
-		     (funcall (cdr cl1-tem) argi)))
-
-		  ((equal argi "-no-splash")
-		   (setq inhibit-startup-screen t))
-
-		  ((member argi '("-f"	; what the manual claims
-				  "-funcall"
-				  "-e"))  ; what the source used to say
-		   (setq inhibit-startup-screen t)
-		   (setq cl1-tem (intern (or argval (pop command-line-args-left))))
-		   (if (commandp cl1-tem)
-		       (command-execute cl1-tem)
-		     (funcall cl1-tem)))
-
-		  ((member argi '("-eval" "-execute"))
-		   (setq inhibit-startup-screen t)
-		   (eval (read (or argval (pop command-line-args-left)))))
-
-		  ((member argi '("-L" "-directory"))
-		   (setq cl1-tem (expand-file-name
-			      (command-line-normalize-file-name
-			       (or argval (pop command-line-args-left)))))
-		   (cond (splice (setcdr splice (cons cl1-tem (cdr splice)))
-				 (setq splice (cdr splice)))
-			 (t (setq load-path (cons cl1-tem load-path)
-				  splice load-path))))
-
-		  ((member argi '("-l" "-load"))
-		   (let* ((file (command-line-normalize-file-name
-				 (or argval (pop command-line-args-left))))
-			  ;; Take file from default dir if it exists there;
-			  ;; otherwise let `load' search for it.
-			  (file-ex (expand-file-name file)))
-		     (when (file-exists-p file-ex)
-		       (setq file file-ex))
-		     (load file nil t)))
-
-		  ;; This is used to handle -script.  It's not clear
-		  ;; we need to document it (it is totally internal).
-		  ((member argi '("-scriptload"))
-		   (let* ((file (command-line-normalize-file-name
-				 (or argval (pop command-line-args-left))))
-			  ;; Take file from default dir.
-			  (file-ex (expand-file-name file)))
-		     (load file-ex nil t t)))
-
-		  ((equal argi "-insert")
-		   (setq inhibit-startup-screen t)
-		   (setq cl1-tem (or argval (pop command-line-args-left)))
-		   (or (stringp cl1-tem)
-		       (error "File name omitted from `-insert' option"))
-		   (insert-file-contents (command-line-normalize-file-name cl1-tem)))
-
-		  ((equal argi "-kill")
-		   (kill-emacs t))
-
-		  ;; This is for when they use --no-desktop with -q, or
-		  ;; don't load Desktop in their .emacs.  If desktop.el
-		  ;; _is_ loaded, it will handle this switch, and we
-		  ;; won't see it by the time we get here.
-		  ((equal argi "-no-desktop")
-		   (message "\"--no-desktop\" ignored because the Desktop package is not loaded"))
-
-		  ((string-match "^\\+[0-9]+\\'" argi)
-		   (setq cl1-line (string-to-number argi)))
-
-		  ((string-match "^\\+\\([0-9]+\\):\\([0-9]+\\)\\'" argi)
-		   (setq cl1-line (string-to-number (match-string 1 argi))
-			 cl1-column (string-to-number (match-string 2 argi))))
-
-		  ((setq cl1-tem (assoc orig-argi command-line-x-option-alist))
-		   ;; Ignore X-windows options and their args if not using X.
-		   (setq command-line-args-left
-			 (nthcdr (nth 1 cl1-tem) command-line-args-left)))
-
-		  ((setq cl1-tem (assoc orig-argi command-line-ns-option-alist))
-		   ;; Ignore NS-windows options and their args if not using NS.
-		   (setq command-line-args-left
-			 (nthcdr (nth 1 cl1-tem) command-line-args-left)))
-
-		  ((member argi '("-find-file" "-file" "-visit"))
-		   (setq inhibit-startup-screen t)
-		   ;; An explicit option to specify visiting a file.
-		   (setq cl1-tem (or argval (pop command-line-args-left)))
-		   (unless (stringp cl1-tem)
-		     (error "File name omitted from `%s' option" argi))
-		   (setq file-count (1+ file-count))
-		   (let ((file (expand-file-name
-				(command-line-normalize-file-name cl1-tem)
-				cl1-dir)))
-		     (if (= file-count 1)
-			 (setq first-file-buffer (find-file file))
-		       (find-file-other-window file)))
-		   (unless (zerop cl1-line)
-		     (goto-char (point-min))
-		     (forward-line (1- cl1-line)))
-		   (setq cl1-line 0)
-		   (unless (< cl1-column 1)
-		     (move-to-column (1- cl1-column)))
-		   (setq cl1-column 0))
-
-		  ((equal argi "--")
-		   (setq just-files t))
-		  (t
-		   ;; We have almost exhausted our options. See if the
-		   ;; user has made any other command-line options available
-		   (let ((hooks command-line-functions)
-			 (did-hook nil))
-		     (while (and hooks
-				 (not (setq did-hook (funcall (car hooks)))))
-		       (setq hooks (cdr hooks)))
-		     (if (not did-hook)
-			 ;; Presume that the argument is a file name.
-			 (progn
-			   (if (string-match "\\`-" argi)
-			       (error "Unknown option `%s'" argi))
-			   (unless initial-window-system
-			     (setq inhibit-startup-screen t))
-			   (setq file-count (1+ file-count))
-			   (let ((file
-				  (expand-file-name
-				   (command-line-normalize-file-name orig-argi)
-				   cl1-dir)))
-			     (cond ((= file-count 1)
-				    (setq first-file-buffer (find-file file)))
-				   (inhibit-startup-screen
-				    (find-file-other-window file))
-				   (t (find-file file))))
-			   (unless (zerop cl1-line)
-			     (goto-char (point-min))
-			     (forward-line (1- cl1-line)))
-			   (setq cl1-line 0)
-			   (unless (< cl1-column 1)
-			     (move-to-column (1- cl1-column)))
-			   (setq cl1-column 0))))))
-	    ;; In unusual circumstances, the execution of Lisp code due
-	    ;; to command-line options can cause the last visible frame
-	    ;; to be deleted.  In this case, kill emacs to avoid an
-	    ;; abort later.
-	    (unless (frame-live-p (selected-frame)) (kill-emacs nil))))))
-
-    (when initial-buffer-choice
-      (cond ((eq initial-buffer-choice t)
-	     (switch-to-buffer (get-buffer-create "*scratch*")))
-	    ((stringp initial-buffer-choice)
-	     (find-file initial-buffer-choice))))
-
-    ;; If *scratch* exists and is empty, insert initial-scratch-message.
-    (and initial-scratch-message
-	 (get-buffer "*scratch*")
-	 (with-current-buffer "*scratch*"
-	   (when (zerop (buffer-size))
-	     (insert initial-scratch-message)
-	     (set-buffer-modified-p nil))))
-
-    (if (or inhibit-startup-screen
-	    initial-buffer-choice
-	    noninteractive
-	    inhibit-x-resources)
-
-	;; Not displaying a startup screen.  If 3 or more files
-	;; visited, and not all visible, show user what they all are.
-	(and (> file-count 2)
-	     (not noninteractive)
-	     (not inhibit-startup-buffer-menu)
-	     (or (get-buffer-window first-file-buffer)
-		 (list-buffers)))
-
-      ;; Display a startup screen, after some preparations.
-
-      ;; If there are no switches to process, we might as well
-      ;; run this hook now, and there may be some need to do it
-      ;; before doing any output.
-      (run-hooks 'emacs-startup-hook)
-      (and term-setup-hook
-	   (run-hooks 'term-setup-hook))
-      (setq inhibit-startup-hooks t)
-
-      ;; It's important to notice the user settings before we
-      ;; display the startup message; otherwise, the settings
-      ;; won't take effect until the user gives the first
-      ;; keystroke, and that's distracting.
-      (when (fboundp 'frame-notice-user-settings)
-	(frame-notice-user-settings))
-
-      ;; If there are no switches to process, we might as well
-      ;; run this hook now, and there may be some need to do it
-      ;; before doing any output.
-      (when window-setup-hook
-	(run-hooks 'window-setup-hook)
-	;; Don't let the hook be run twice.
-	(setq window-setup-hook nil))
-
-      ;; ;; Do this now to avoid an annoying delay if the user
-      ;; ;; clicks the menu bar during the sit-for.
-      ;; (when (display-popup-menus-p)
-      ;; 	(precompute-menubar-bindings))
-      ;; (with-no-warnings
-      ;; 	(setq menubar-bindings-done t))
-
-      (if (> file-count 0)
-	  (display-startup-screen t)
-	(display-startup-screen nil)))))
-
-(defun command-line-normalize-file-name (file)
-  "Collapse multiple slashes to one, to handle non-Emacs file names."
-  (save-match-data
-    ;; Use arg 1 so that we don't collapse // at the start of the file name.
-    ;; That is significant on some systems.
-    ;; However, /// at the beginning is supposed to mean just /, not //.
-    (if (string-match "^///+" file)
-	(setq file (replace-match "/" t t file)))
-    (and (memq system-type '(ms-dos windows-nt))
-	 (string-match "^[A-Za-z]:\\(\\\\[\\\\/]\\)" file) ; C:\/ or C:\\
-	 (setq file (replace-match "/" t t file 1)))
-    (while (string-match "//+" file 1)
-      (setq file (replace-match "/" t t file)))
-    file))
-
-;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
-;;; startup.el ends here

=== removed directory '.pc/0004-Adjust-documentation-references-for-Debian.patch'
=== removed directory '.pc/0004-Adjust-documentation-references-for-Debian.patch/etc'
=== removed file '.pc/0004-Adjust-documentation-references-for-Debian.patch/etc/NEWS'
--- .pc/0004-Adjust-documentation-references-for-Debian.patch/etc/NEWS	2011-04-10 10:33:31 +0000
+++ .pc/0004-Adjust-documentation-references-for-Debian.patch/etc/NEWS	1970-01-01 00:00:00 +0000
@@ -1,2515 +0,0 @@
-GNU Emacs NEWS -- history of user-visible changes.
-
-Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-Please send Emacs bug reports to [e-mail].
-If possible, use M-x report-emacs-bug.
-
-This file is about changes in Emacs version 23.
-
-See files NEWS.22, NEWS.21, NEWS.20, NEWS.19, NEWS.18, and NEWS.1-17
-for changes in older Emacs versions.
-
-You can narrow news to a specific version by calling `view-emacs-news'
-with a prefix argument or by typing C-u C-h C-n.
-
-

-* Installation Changes in Emacs 23.3
-
-** New configure option --with-crt-dir specifies the location of your
-crt*.o files, if they are in a non-standard location.  This is only
-used on x86-64 and s390x GNU/Linux architectures.
-
-* Changes in Emacs 23.3
-
-** The last-resort backup file `%backup%~' is now written to
-`user-emacs-directory', instead of the user's home directory.
-
-** If Emacs creates `user-emacs-directory', that directory's
-permissions are now set to rwx------, ignoring the umask.
-
-

-* Changes in Specialized Modes and Packages in Emacs 23.3
-
-** Calendar and diary
-
-*** The appt-add command takes an optional argument, the warning time.
-This can be used in place of the default appt-message-warning-time.
-
-** Python mode
-
-*** You can allow inferior Python processes to load modules from the
-current directory by setting `python-remove-cwd-from-path' to nil.
-
-** Rmail
-
-*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
-MIME contents automatically.  You can customize the variable
-`rmail-enable-mime' back to `nil' to disable this automatic MIME
-decoding.
-
-*** The command `rmail-mime' change the displaying of a MIME message
-between decoded presentation form and raw data if `rmail-enable-mime'
-is non-nil.  And, with prefix argument, it change only the displaying
-of the MIME entity at point.
-
-*** The new command `rmail-mime-next-item' (bound to TAB) moves point
-to the next item of MIME message.
-
-*** The new command `rmail-mime-previous-item' (bound to backtab) moves
-point to the previous item of MIME message.
-
-*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
-body of the MIME entity at point.
-
-** VC and related modes
-
-*** New VC command `vc-log-incoming', bound to `C-x v I'.
-This shows a log of changes to be received with a pull operation.
-For Git, this runs "git fetch" to make the necessary data available
-locally; this requires version 1.7 or newer.
-
-*** New VC command `vc-log-outgoing', bound to `C-x v O'.
-This shows a log of changes to be sent in the next commit.
-
-*** New VC command vc-find-conflicted-file.
-
-*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
-reruns the corresponding VC command to compute an up to date version
-of the buffer.
-
-*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
-
-*** Special markup can be added to log-edit buffers.
-You can add headers specifying additional information to be supplied
-to the version control system.  For example:
-
-  Author: J. R. Hacker <[e-mail]>
-  Fixes: 4204
-  Actual text of log entry...
-
-Bazaar recognizes the headers "Author", "Date" and "Fixes".
-Git, Mercurial, and Monotone recognize "Author" and "Date".
-Any unknown header is left as is in the message, so it is not lost.
-
-** Obsolete packages
-
-*** lmenu.el and cl-compat.el are now obsolete.
-
-

-* New Modes and Packages in Emacs 23.3
-
-** smie.el is a generic navigation and indentation engine.
-It takes a simple BNF description of the grammar, and provides both
-sexp-style navigation (jumping over begin..end pairs) as well as
-indentation, which can be adjusted via ad-hoc indentation rules.
-
-

-* Incompatible Lisp Changes in Emacs 23.3
-
-** posn-col-row now excludes the header line from the row count
-If the frame has a header line, posn-col-row will count row numbers
-starting from the first line of text below the header line.
-
-

-* Lisp changes in Emacs 23.3
-
-** `e' and `pi' are now called `float-e' and `float-pi'.
-  The old names are obsolete.
-
-** The use of unintern without an obarray arg is now obsolete.
-
-** The function `princ-list' is now obsolete.
-
-** The yank-handler argument to kill-region and friends is now obsolete.
-
-** New function byte-to-string, like char-to-string but for bytes.
-
-

-* Changes in Emacs 23.3 on non-free operating systems
-
-** The nextstep port can have different modifiers for the left and right
-alt/option key by customizing the value for ns-right-alternate-modifier.
-
-

-* Installation Changes in Emacs 23.2
-
-** New configure options for Emacs developers.
-These are not new features; only the configure flags are new.
-
-*** --enable-profiling builds Emacs with profiling enabled.
-This might not work on all platforms.
-
-*** --enable-checking[=OPTIONS] builds emacs with extra runtime checks.
-
-** `make install' now consistently ignores umask, creating a
-world-readable install.
-
-** Emacs compiles with Gconf support, if it is detected.
-Use the configure option --without-gconf to disable this.
-This is used by the `font-use-system-font' feature (see below).
-
-* Startup Changes in Emacs 23.2
-
-** The command-line option -Q (--quick) also inhibits loading X resources.
-However, if Emacs is compiled with the Lucid or Motif toolkit, X
-resource settings for the graphical widgets are still applied.
-On Windows, the -Q option causes Emacs to ignore Registry settings,
-but environment variables set on the Registry are still honored.
-
-*** The new variable `inhibit-x-resources' shows whether X resources
-were loaded.
-
-** New command-line option -mm (--maximized) maximizes the initial frame.
-
-* Changes in Emacs 23.2
-
-** The maximum size of buffers (and the largest fixnum) is doubled.
-On typical 32bit systems, buffers can now be up to 512MB.
-
-** The default value of `trash-directory' is now nil.
-This means that `move-file-to-trash' trashes files according to
-freedesktop.org specifications, the same method used by the Gnome,
-KDE, and XFCE desktops.  (This change has no effect on Windows, which
-uses `system-move-file-to-trash' for trashing.)
-
-** The pointer now becomes invisible when typing.
-Customize `make-pointer-invisible' to disable this feature.
-
-** Font changes
-
-*** Emacs can use the system default monospaced font in Gnome.
-To enable this feature, set `font-use-system-font' to non-nil (it is
-nil by default).  If the system default changes, Emacs changes also.
-This feature requires Gconf support, which is automatically included
-at compile-time if configure detects the gconf libraries (you can
-disable this with the configure option --without-gconf).
-
-*** On X11, Emacs reacts to Xft changes made by configuration tools,
-via the XSETTINGS mechanism.  This includes antialias, hinting,
-hintstyle, RGBA, DPI and lcdfilter changes.
-
-** Killing a buffer with a running process now asks for confirmation.
-To remove this query, remove `process-kill-buffer-query-function' from
-`kill-buffer-query-functions', or set the appropriate process flag
-with `set-process-query-on-exit-flag'.
-
-** File-local variable changes
-
-*** Specifying a minor mode as a local variables enables that mode,
-unconditionally.  The previous behavior, toggling the mode, was
-neither reliable nor generally desirable.
-
-*** There are new commands for adding and removing file-local variables:
-`add-file-local-variable', `delete-file-local-variable',
-`add-file-local-variable-prop-line', and
-`delete-file-local-variable-prop-line'.
-
-*** There are new commands for adding and removing directory-local variables,
-and copying them to and from file-local variable lists:
-`add-dir-local-variable', `delete-dir-local-variable',
-`copy-dir-locals-to-file-locals',
-`copy-dir-locals-to-file-locals-prop-line' and
-`copy-file-locals-to-dir-locals'.
-
-** Internationalization changes
-
-*** Unibyte sessions are now considered obsolete.
-This refers to the EMACS_UNIBYTE environment variable as well as the
---unibyte, --multibyte, --no-multibyte, and --no-unibyte command line
-arguments.  Customizing enable-multibyte-characters and setting
-default-enable-multibyte-characters are also deprecated.
-
-*** New coding system `utf-8-hfs'.
-This is suitable for default-file-name-coding-system on Mac OS X; see
-international/ucs-normalize.el.
-
-** Function arguments in *Help* buffers are now shown in upper-case.
-Customize `help-downcase-arguments' to t to show them in lower-case.
-
-** New command `async-shell-command', bound globally to `M-&'.
-This executes the command asynchronously, similar to calling `M-!' and
-manually adding an ampersand to the end of the command.  With `M-&',
-you don't need the ampersand.  The output appears in the buffer
-`*Async Shell Command*'.
-
-** When running in a new enough xterm (newer than version 242), Emacs
-asks xterm what the background color is and it sets up faces
-accordingly for a dark background if needed (the current default is to
-consider the background light).
-
-

-* Editing Changes in Emacs 23.2
-
-** Kill-ring and selection changes
-
-*** If `select-active-regions' is t, any active region automatically
-becomes the primary selection (for interaction with other window
-applications).  If you enable this, you might want to bind
-`mouse-yank-primary' to Mouse-2.
-
-*** When `save-interprogram-paste-before-kill' is non-nil, the kill
-commands save the interprogram-paste selection into the kill ring
-before doing anything else.  This avoids losing the selection.
-
-*** When `kill-do-not-save-duplicates' is non-nil, identical
-subsequent kills are not duplicated in the `kill-ring'.
-
-** Completion changes
-
-*** The new command `completion-at-point' provides mode-sensitive completion.
-
-*** tab-always-indent set to `complete' lets TAB do completion as well.
-
-*** The new completion-style `initials' is available.
-For instance, this can complete M-x lch to list-command-history.
-
-*** The new variable `completions-format' determines how completions
-are displayed in the *Completions* buffer.  If you set it to
-`vertical', completions are sorted vertically in columns.
-
-** The default value of `blink-matching-paren-distance' is increased.
-
-** M-n provides more default values in the minibuffer for commands
-that read file names.  These include the file name at point (when ffap
-is loaded without ffap-bindings), the file name on the current line
-(in Dired buffers), and the directory names of adjacent Dired windows
-(for Dired commands that operate on several directories, such as copy,
-rename, or diff).
-
-** M-r is bound to the new `move-to-window-line-top-bottom'.
-This moves point to the window center, top and bottom on successive
-invocations, in the same spirit as the C-l (recenter-top-bottom)
-command.
-
-** The new variable `recenter-positions' determines the default
-cycling order of C-l (`recenter-top-bottom').
-
-** The abbrevs file is now a file named abbrev_defs in
-user-emacs-directory; but the old location, ~/.abbrev_defs, is used if
-that file exists.
-
-

-* Changes in Specialized Modes and Packages in Emacs 23.2
-
-** The bookmark menu has a narrowing search via bookmark-bmenu-search.
-
-** Calc
-
-*** The Calc settings file is now a file named calc.el in
-user-emacs-directory; but the old location, ~/.calc.el, is used if
-that file exists.
-
-*** Graphing commands (`g f' etc.) now work on MS-Windows, if you have
-the native Windows port of Gnuplot version 3.8 or later installed.
-
-** Calendar and diary
-
-*** Fancy diary display is now the default.
-If you prefer the simple display, customize `diary-display-function'.
-
-*** The diary's fancy display now enables view-mode.
-
-*** The command `calendar-current-date' accepts an optional argument
-giving an offset from today.
-
-** Desktop
-
-*** The default value for `desktop-buffers-not-to-save' is nil.
-This means Desktop will try restoring all buffers, when you restart
-your Emacs session.  Also, `desktop-buffers-not-to-save' is only
-effective for buffers that have no associated file.  If you want to
-exempt buffers that do correspond to files, customize the value of
-`desktop-files-not-to-save' instead.
-
-** Dired
-
-*** The new variable `dired-auto-revert-buffer', if non-nil, causes
-Dired buffers to be reverted automatically on revisiting them.
-
-** DocView
-
-*** When `doc-view-continuous' is non-nil, scrolling a line
-on the page edge advances to the next/previous page.
-
-** Elint
-
-*** Elint now uses compilation-mode.
-
-*** Elint can now scan individual files and whole directories,
-and can be run in batch mode.
-
-*** Elint does a more thorough initialization, and recognizes more built-in
-functions and variables.  Customize `elint-scan-preloaded' if you want
-to sacrifice some accuracy for a faster startup.
-
-*** Elint attempts some basic understanding of featurep and (f)boundp tests.
-
-*** Customize `elint-ignored-warnings' to suppress some warnings.
-
-** GDB-UI
-
-*** Toolbar functionality for reverse debugging.  Display of STL
-collections as watch expressions.  These features require GDB 7.0 or later.
-
-** Grep
-
-*** A new command `zrgrep' searches recursively in gzipped files.
-
-** Info
-
-*** The new command `Info-virtual-index' bound to "I" displays a menu of
-matched topics found in the index.
-
-*** The new command `info-finder' replaces finder.el with a virtual Info
-manual that generates an Info file which gives the same information
-through a menu structure.
-
-** LaTeX mode now provides completion (via completion-at-point).
-
-** Message mode is now the default mode for composing mail.
-
-The default for `mail-user-agent' is now message-user-agent, so the
-C-x m (`compose-mail') command uses Message mode instead of Mail mode.
-
-Message mode has been included in Emacs, as part of the Gnus package,
-for several years.  It provides several features that are absent in
-Mail mode, such as MIME handling.
-
-*** If the user has not customized mail-user-agent, `compose-mail'
-checks for Mail mode customizations, and issues a warning if these
-customizations are found.  This alerts users who may otherwise be
-unaware that their mail configuration has changed.
-
-To disable this check, set compose-mail-user-agent-warnings to nil.
-
-** The default value of mail-interactive is t, since Emacs 23.1.
-(This was not announced at the time.)  It means that when sending mail,
-Emacs will wait for the process sending mail to return.  If you
-experience delays when sending mail, you may wish to set this to nil.
-
-** nXML mode is now the default for editing XML files.
-
-** pcomplete provides a new command `pcomplete-std-completion' which
-is similar to `pcomplete' but using the standard completion UI code.
-
-** Shell (and other comint modes)
-
-*** M-s is no longer bound to `comint-next-matching-input'.
-
-*** M-r is now bound to `comint-history-isearch-backward-regexp'.
-This starts an incremental search of the comint/shell input history.
-
-*** ansi-color is now enabled by default in Shell mode.
-To disable it, set ansi-color-for-comint-mode to nil.
-
-** Tramp
-
-*** New connection methods "rsyncc", "imap" and "imaps".
-On systems which support GVFS-Fuse, Tramp offers also the new
-connection methods "dav", "davs", "obex" and "synce".
-
-** VC and related modes
-
-*** When using C-x v v or C-x v i on a unregistered file that is in a
-directory not controlled by any VCS, ask the user what VC backend to
-use to create a repository, create a new repository and register the
-file.
-
-*** New command `vc-root-print-log', bound to `C-x v L'.
-This displays a `*vc-change-log*' buffer showing the history of the
-version-controlled directory tree as a whole.
-
-*** New command `vc-root-diff', bound to `C-x v D'.
-This is similar to `vc-diff', but compares the entire directory tree
-of the current VC directory with its working revision.
-
-*** `C-x v l' and `C-x v L' do not show the full log by default.
-The number of entries shown can be chosen interactively with a prefix
-argument, or by customizing vc-log-show-limit.  The `*vc-change-log*'
-buffer now contains buttons at the end of the buffer, which can be
-used to increase the number of entries shown.  RCS, SCCS, and CVS do
-not support this feature.
-
-*** vc-annotate supports annotations through file copies and renames,
-it displays the old names for the files and it can show logs/diffs for
-the corresponding lines.  Currently only Git and Mercurial take
-advantage of this feature.
-
-*** The log command in vc-annotate can display a single log entry
-instead of redisplaying the full log.  The RCS, CVS and SCCS VC
-backends do not support this.
-
-*** When a file is not found, VC will not try to check it out of RCS anymore.
-
-*** Diff and log operations can be used from Dired buffers.
-
-*** vc-git changes
-
-**** The short log format for git makes use of the graph display,
-so it's not supported on git versions earlier than 1.5.6.
-
-**** vc-dir uses the --relative option of git, and so requires at least
-git version 1.5.5.
-
-**** Support for operating with stashes has been added to vc-dir:
-the stash list is displayed in the *vc-dir* header, stashes can be
-created, removed, applied and their content displayed.
-
-*** vc-bzr supports operating with shelves: the shelve list is
-displayed in the *vc-dir* header, shelves can be created, removed and applied.
-
-*** log-edit-strip-single-file-name controls whether or not single filenames
-are stripped when copying text from the ChangeLog to the *VC-Log* buffer.
-
-** Miscellaneous
-
-*** Interactively `multi-isearch-buffers' and `multi-isearch-buffers-regexp'
-read buffer names to search, one by one, ended with RET.  With a prefix
-argument, they ask for a regexp, and search in buffers whose names match
-the specified regexp.  Interactively `multi-isearch-files' and
-`multi-isearch-files-regexp' read file names to search, one by one,
-ended with RET.  With a prefix argument, they ask for a wildcard, and
-search in file buffers whose file names match the specified wildcard.
-
-*** Autorevert Tail mode now works also for remote files.
-
-*** The new eshell built-in commands `su' and `sudo' support Tramp.
-Thus, they change `default-directory' to reflect the new user id, and
-let commands run under that user's permissions.  This works even when
-`default-directory' is already remote.  Calling the external commands
-is possible via `*su' or `*sudo', respectively.
-
-** Obsolete packages
-
-*** sym-comp.el is now obsolete, superseded by completion-at-point.
-
-*** lucid.el and levents.el are now obsolete.
-
-

-* New Modes and Packages in Emacs 23.2
-
-** CEDET (the Collection of Emacs Development Tools) is now in Emacs.
-This is a collection of packages to aid with using Emacs as an IDE
-(integrated development environment):
-
-*** The Semantic package allows the use of parsers to intelligently
-edit and navigate source code.  Parsers for C/C++, Java, Javascript,
-and several other languages are included by default, and Semantic can
-also interface with external tools such as GNU Global and GNU Idutils.
-
-To enable Semantic, use the global minor mode `semantic-mode'.
-See the Semantic manual for details.
-
-*** EDE (Emacs Development Environment) is a package for managing code
-projects, including features such as automatic Makefile generation.
-
-To enable EDE, use the minor mode `global-ede-mode'.
-See the EDE manual for details.
-
-*** SRecode is a library for recoding Semantic tags back into source
-code.  It is currently used by some parts of Semantic and EDE; in the
-future, it may be used for code generation features.
-
-*** The EIEIO library implements a subset of the Common Lisp Object
-System (CLOS).  It is used by the other CEDET packages.
-
-** mpc.el is a front end for the Music Player Daemon.  Run it with M-x mpc.
-
-** htmlfontify.el turns a fontified Emacs buffer into an HTML page.
-
-** js.el is a new major mode for JavaScript files.
-
-** imap-hash.el is a new library to address IMAP mailboxes as hashtables.
-
-

-* Incompatible Lisp Changes in Emacs 23.2
-
-** The Lisp reader turns integers that are too large/small into floats.
-For instance, on machines where `536870911' is the largest integer,
-reading `536870912' gives the floating-point object `536870912.0'.
-
-This change only concerns the Lisp reader; it does not affect how
-actual integer objects overflow.
-
-** Several obsolete functions removed.
-The functions have been obsolete since Emacs 19, and are unlikely to
-be in use:
-
-  time-stamp-month-dd-yyyy, time-stamp-dd/mm/yyyy, time-stamp-mon-dd-yyyy
-  time-stamp-dd-mon-yy, time-stamp-yy/mm/dd, time-stamp-yyyy/mm/dd,
-  time-stamp-yyyy-mm-dd, time-stamp-yymmdd, time-stamp-hh:mm:ss,
-  time-stamp-hhmm, baud-rate
-
-** Support for generating Emacs 18 compatible bytecode (by setting
-the variable `byte-compile-compatibility') has been removed.
-
-** In image-mode.el `image-mode-maybe' is obsolete.
-Instead, you can either use `image-mode' (which displays an image file
-as the actual image initially), or `image-mode-as-text' (when you want
-to display an image file as text initially).  `image-mode-as-text' is a
-combination of a non-image mode from `auto-mode-alist' (or Fundamental
-mode) and `image-minor-mode'.  `image-minor-mode' provides a `C-c C-c'
-key binding to toggle image display.
-`image-toggle-display-text' removes image properties.
-`image-toggle-display-image' adds image properties.
-`image-toggle-display' toggles between `image-mode-as-text' and `image-mode'.
-
-

-* Lisp changes in Emacs 23.2
-
-** All the default-FOO variables that hold the default value of the FOO
-variable, are now declared obsolete.
-
-** read-key is a function halfway between read-event and read-key-sequence.
-It reads a single key, but obeys input and escape sequence decoding.
-
-** Frame parameter changes
-
-*** You can give the `fullscreen' frame parameter the value `maximized'.
-This maximizes the frame.
-
-*** The new frame parameter `sticky' makes Emacs frames sticky in
-virtual desktops.
-
-** Completion changes
-
-*** completion-base-size is obsoleted by completion-base-position.
-This change causes a few backward incompatibilities, mostly with
-choose-completion-string-functions where the `mini-p' argument has
-been replaced by a `base-position' argument, and where the `base-size'
-argument is now always nil.
-
-*** New function `completion-in-region' to use the standard completion
-facilities on a particular region of text.
-
-*** The 4th arg to all-completions (aka hide-spaces) is declared obsolete.
-
-*** completion-annotate-function specifies how to compute annotations
-for completions displayed in *Completions*.
-
-** Minibuffer changes
-
-*** read-file-name-predicate is obsolete.  It was used to pass the predicate
-to read-file-name-internal because read-file-name-internal abused its `pred'
-argument to pass the current directory, but this hack is not needed
-any more.
-
-** Changes to file-manipulation functions
-
-*** `delete-directory' has an optional parameter RECURSIVE.
-
-*** New function `copy-directory', which copies a directory recursively.
-
-** called-interactively-p now takes one argument and replaces interactive-p
-which is now marked obsolete.
-
-** New function set-advertised-calling-convention makes it possible
-to obsolete arguments as well as make some arguments mandatory.
-
-** You can control which binding is preferentially shown in menus and
-docstrings by adding a `:advertised-binding' property to the corresponding
-command's symbol.  That property can hold a single binding or a list
-of bindings.
-
-** Network and process changes
-
-*** start-process-shell-command and start-file-process-shell-command
-now only take a single `command' argument.
-
-*** The new variable `process-file-side-effects' should be set to nil
-if a `process-file' call does not change a remote file.  This allows
-file name handlers such as Tramp to optimizations.
-
-*** make-network-process can now also create `seqpacket' Unix sockets.
-
-** Loading changes
-
-*** eval-next-after-load is obsolete.
-
-*** New hook `after-load-functions' run after loading an Elisp file.
-
-** Byte compilation changes
-
-*** Changing the file-names generated by byte-compilation by redefining
-the function `byte-compile-dest-file' before loading bytecomp.el is obsolete.
-Instead, customize byte-compile-dest-file-function.
-
-*** `byte-compile-warnings' has new members, `constants' and `suspicious'.
-
-** New macro with-silent-modifications to tweak text properties without
-affecting the buffer's modification state.
-
-** Hash tables have a new printed representation that is readable.
-The feature `hashtable-print-readable' identifies this new
-functionality.
-
-** New functions for performing Unicode normalization:
-ucs-normalize-NFD-region, ucs-normalize-NFD-string,
-ucs-normalize-NFC-region, ucs-normalize-NFC-string,
-ucs-normalize-NFKD-region, ucs-normalize-NFKD-string,
-ucs-normalize-NFKC-region, ucs-normalize-NFKC-string,
-ucs-normalize-HFS-NFD-region, ucs-normalize-HFS-NFD-string,
-ucs-normalize-HFS-NFC-region, ucs-normalize-HFS-NFC-string.
-
-** Face aliases can now be marked as obsolete, using the macro
-`define-obsolete-face-alias'.
-
-** New function `window-full-height-p', analogous to the full-width version.
-
-

-* Changes in Emacs 23.2 on non-free operating systems
-
-** On MS-Windows, `display-time' now displays the system load average
-as well as the time, as it does on GNU and Unix.
-
-

-* Installation Changes in Emacs 23.1
-
-** The default X toolkit is now Gtk+, rather than Lucid.
-The configure option `--with-gtk' has been removed.  Gtk is now the
-default toolkit, but you can use --with-x-toolkit=gtk if necessary.
-
-** New font code.
-Fonts are handled by new code capable of dealing with multiple font
-backends.  This uses the freetype and fontconfig libraries.
-
-*** Emacs now accepts font names supplied in the fontconfig format
-(e.g. "monospace-12:bold") and GTK format (e.g. "Monospace Bold 12").
-
-*** Added support for local fonts (fonts installed on the machine
-where Emacs is running).
-
-*** Added support for the Xft library for antialiasing.
-
-*** Added support for the otf library for complex text layout by
-OpenType fonts.
-
-*** Added support for the m17n library for text shaping.
-
-** Changes to image support
-
-*** configure now checks for libgif before libungif when searching for
-a GIF library.
-
-*** Emacs now supports the SVG image format through librsvg2.
-
-*** Emacs now supports multi-page TIFF images.
-
-** New NeXTSTEP-based port.
-This provides support for GNUstep (via the GNUstep libraries) and Mac
-OS X (via the Cocoa libraries).
-
-Specify --with-ns to configure for this.  By default, a self-contained
-app will be built (containing all lisp).  To install/share lisp with
-other emacsen (e.g. X11 build) use --disable-ns-self-contained.  See
-nextstep/README and nextstep/INSTALL in the Emacs source directory.
-
-** Mac OS X is no longer supported via Carbon.
-Use the NeXTSTEP port, described above.
-
-** The new configuration option "--with-dbus" enables D-Bus language
-bindings for Emacs.
-
-** Support for many obsolete platforms has been removed.
-See the list at the end of etc/MACHINES for details.
-
-*** Support for systems without alloca has been removed.
-
-*** Support for Sun windows has been removed.
-
-*** The `emacstool' utility has been removed.
-
-** The following platforms will be removed in a future Emacs version:
-If you are still using Emacs on one of these platforms, please email
[e-mail] to inform the Emacs developers.
-
-*** Old GNU/Linux systems based on libc version 5.
-
-*** Old FreeBSD, NetBSD, and OpenBSD systems based on the COFF
-executable format.
-
-*** Solaris versions 2.6 and below.
-
-*** Solaris on IBM RS6000 machines.
-
-*** UNIX System V (the original SysV, not later platforms based on it).
-
-*** Unixware on non-x86 machines.
-
-*** Platforms not supporting shared libraries (i.e., requiring the
-NO_SHARED_LIBS compilation flag).
-
-** The configure options `--with-gcc', `--without-gcc' have been removed.
-Configure will use gcc by default.  Set the CC environment variable if
-you need control over which C compiler is used.
-
-** The refcards are now shipped as PDF files.
-
-** The manuals are now licensed under the GNU Free Documentation License v1.3,
-or any later version.
-
-** Emacs 23 comes with a new set of default icons.
-Various resolutions are available as etc/images/icons/hicolor/*/apps/emacs.png.
-The Emacs 22 icon is available as `emacs22.png' in the same location.
-

-* Changes in Emacs 23.1
-
-** Improved X Window System support
-
-*** Emacs now supports using both X displays and ttys in one session.
-With an Emacs server active (M-x server-start), `emacsclient -t'
-creates a tty frame connected to the running emacs server.  You can
-use any number of different ttys.  `emacsclient -c' creates a new X11
-frame on the current $DISPLAY (or a tty frame if $DISPLAY is not set).
-There may be problems if a display exits unexpectedly and Emacs is compiled
-with Gtk+, see etc/PROBLEMS.
-
-You can test for the presence of this feature in your Lisp code by
-testing for the `multi-tty' feature.
-
-*** Emacs starts in the background, as a daemon, when given the
---daemon command line argument.  It disconnects from the terminal and
-starts the server.  Clients can connect and create graphical or
-terminal frames using emacsclient.
-
-**** emacsclient starts emacs in daemon mode and connects to it when
---alternate-editor="" is used (or when the evironment variable
-ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an
-emacs server.
-
-*** The new command close-display-connection closes a connection to a
-remote display.  There are some bugs for Gtk+.  See etc/PROBLEMS.
-
-*** Emacs now supports the XEmbed specification.
-You can embed Emacs in another application on X11.  The new command line
-option --parent-id is used to pass the parent window id to Emacs.  See
-http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
-for details about XEmbed.
-
-*** Emacs can now set the frame opacity.
-The opacity of a frame can be controlled by setting the `alpha' frame
-parameter.  This only takes effect on a compositing window manager for
-the X Window System, such as Compiz, Beryl and Compiz Fusion, on Mac
-OS X, or on Windows 2000 and later versions of Windows.
-
-The alpha parameter should be an integer between 0 (transparent) and
-100 (opaque), or a float number between 0.0 and 1.0.  It can also be a
-cons cell (ACTIVE . INACTIVE), where ACTIVE is the opacity of an
-active frame and INACTIVE is the opacity of non-active frames.
-
-The variable `frame-alpha-lower-limit' defines a lower bound for the
-opacity; the default is 20.
-
-** Internationalization changes
-
-*** The Emacs character set is now a superset of Unicode.
-(It has about four times the code space, which should be plenty).
-
-The internal encoding used for buffers and strings is now
-Unicode-based and called `utf-8-emacs' (`emacs-internal' is an alias
-for this).  This encoding is backward-compatible with Unicode's UTF-8
-encoding.  The internal encoding previously used by Emacs,
-`emacs-mule', is still available for reading and writing files.
-
-During byte-compilation, Emacs 23 uses `utf-8-emacs' to write files.
-As a result, byte-compiled files containing non-ASCII characters can't
-be read by earlier versions of Emacs.  Files compiled by Emacs 20, 21,
-or 22 are loaded correctly as `emacs-mule' (whether or not they
-contain multibyte characters).  This takes somewhat more time, so it
-may be worth recompiling existing .elc files which don't need to be
-shared with older Emacsen.
-
-*** There are new coding systems/aliases; see M-x list-coding-systems.
-
-*** There is a new charset implementation with many new charsets.
-See M-x list-character-sets.  New charsets can be defined conveniently
-as tables of unicodes.
-
-*** There are new language environments for Chinese-GBK,
-Chinese-GB18030, Khmer, Bengali, Punjabi, Gujarati, Oriya, Telugu,
-Sinhala, and TaiViet.
-
-*** The minor modes unify-8859-on-encoding-mode and
-unify-8859-on-decoding-mode are obsolete.
-
-*** `ucs-insert' is bound to `C-x 8 RET' and in addition to hex numbers
-accepts numbers in hash notation (e.g. #o21430 for octal, or #10r8984 for
-decimal).  It also accepts Unicode character names with completion.
-
-*** The `cyrillic-translit' input method supports many new characters.
-Common typographical characters available from Unicode were added to
-`cyrillic-translit': punctuation marks, accented characters, fractions,
-and others.
-
-** Emacs now supports serial port access on GNU/Linux, Unix, and
-Windows.  The new command `serial-term' starts an interactive terminal
-on a serial port.  The serial port can be configured at runtime with
-the mode-line mouse menu.
-
-** Menu Bar changes
-
-*** In the Options menu, the "Set Default Font" item applies the
-selected font to the `default' face on all frames, not just the
-current frame.  Furthermore, if Emacs is compiled with both GTK and
-Fontconfig support, the "Set Default Font" item uses the GTK font
-selection dialog instead of an Emacs pop-up menu.
-
-*** The font setting chosen by "Set Default Font" is saved if the
-"Save Options" item is used.
-
-*** The Tools menu contains a new Encryption/Decryption submenu.
-This contains commands provided by EasyPG, the newly-included
-interface to GnuPG (see New Modes and Packages).
-
-*** In the Options menu, the "Truncate Long Lines in the Buffer" entry
-has been replaced with a submenu offering three different ways to
-handle long lines: truncation, continuation at the window edge, and
-the new word wrapping behavior (see Editing Changes, below).
-
-*** Improvements to menus for major and minor modes
-More major and minor modes now have a mode specific menu, and existing
-mode menus have been improved to include more functionality.
-
-** Mode-line changes
-
-*** The mode-line displays a `@', instead of `-', if the
-default-directory for the current buffer is on a remote machine.
-
-*** The mode-line displays a mode menu when mouse-1 is clicked on a
-minor mode, in the same way as it already did for major modes.
-
-*** The `mode-line-emphasis' face is used to highlight certain
-mode-line information (e.g. waiting for a VC command to finish).
-
-*** The mode-line tooltips have been improved to provide more details.
-
-*** The VC, line/colum number and minor mode indicators on the mode
-line are now interactive: mouse-1 can be used on them to pop up a menu.
-
-** File deletion can make use of the Recycle Bin or system Trash folder.
-Set `delete-by-moving-to-trash' non-nil to use this.  Deleted files
-and directories will then be sent to the Recycle Bin on Windows, and
-to `trash-directory' on other systems.
-
-** Directory-local variables can now be defined.
-By default, Emacs looks in .dir-locals.el for directory-local
-variables.  For more information, see `dir-locals-set-directory-class'
-and `dir-locals-set-class-variables'.
-
-** Emacs can now use `auth-source' for authentication.
-`smtpmail' and `url' (Tramp and Gnus also) use `auth-source' to obtain
-login names and passwords.  The match, if found, is reported
-in *Messages* with the password blanked out.
-
-** `where-is-preferred-modifier' can specify your favorite modifier.
-
-

-* Startup Changes in Emacs 23.1
-
-** The option `inhibit-startup-screen' (with aliases to old names
-`inhibit-splash-screen' and `inhibit-startup-message') doesn't inhibit
-display of the initial message in the *scratch* buffer.  If you don't
-want to display the initial message in the *scratch* buffer at startup,
-you can set the option `initial-scratch-message' to nil.
-
-** New user option `initial-buffer-choice' specifies what to display
-after starting Emacs: startup screen, *scratch* buffer, visiting a
-file or directory.
-
-** New alias `argv' for `command-line-args-left'
-This is a convenience alias, so that one can write `(pop argv)'
-inside of --eval command line arguments in order to access
-following arguments.
-
-** The abbrev file is no longer read at startup in batch mode.
-
-** Emacs now supports invocation by an X session manager.
-It can save a session and restore it later.  See the documentation of
-the functions `emacs-session-save' and `emacs-session-restore'.
-(Actually, this feature was introduced with Emacs 22, but it was not
-documented.)
-

-* Incompatible Editing Changes in Emacs 23.1
-
-** In Dired, `dired-flag-garbage-files' is rebound from `&' to `%&'
-on the regexp command prefix map.
-
-** In Dired-x, all command guesses for ! are now added to the default
-list accessible by M-n instead of pushing all guesses temporarily into
-the history list.
-
-** In Isearch mode, a special case of typing `C-w' at the beginning of
-the minibuffer that toggles word search (i.e. using key sequences
-`C-s RET C-w' or `C-s M-e C-w') is obsolete.  You can use the global key
-`M-s w' to start word search, or type `M-s w' in Isearch mode to
-toggle word search.  To start nonincremental word search you can now use
-`M-s w RET' and `M-s w C-r RET' instead of `C-s RET C-w' and `C-r RET C-w'.
-
-** In Info, `Info-search' is unbound from `M-s' to allow using `M-s w'
-for word search as well as other search commands from the global prefix
-key `M-s'.  `Info-search' is still bound to `s', and also incremental
-search commands `C-s', `C-M-s', `C-r', `C-M-r' are available for searching
-through multiple Info nodes, together with their nonincremental versions
-`C-s RET', `C-r RET', `C-M-s RET', `C-M-r RET', `M-s w RET'.
-
-** In Text mode, `center-line' and `center-paragraph' are rebound from
-`M-s' and `M-S' to global keys `M-o M-s' and `M-o M-S' on the global
-prefix map `M-o', which is intended for such formatting commands.
-
-** The following input methods were removed in Emacs 22.2, but this was
-not advertised: danish-alt-postfix, esperanto-alt-postfix,
-finnish-alt-postfix, german-alt-postfix, icelandic-alt-postfix,
-norwegian-alt-postfix, scandinavian-alt-postfix, spanish-alt-postfix,
-and swedish-alt-postfix.  Use the versions without "alt-", which are
-identical.
-
-

-* Editing Changes in Emacs 23.1
-
-** The C-n and C-p line-motion commands now move by screen lines,
-taking continued lines and variable-width characters into account.
-Setting `line-move-visual' to nil reverts this to the previous
-behavior (i.e., motion by logical lines based on buffer contents
-alone).
-
-** C-x C-c now invokes `save-buffers-kill-terminal', and C-z now
-invokes `suspend-frame'.  These changes are for compatibility with the
-new multi-tty support (see `Improved X Window System support' above).
-
-** Mark changes
-
-*** Transient Mark mode is now on by default.
-
-*** mark-even-if-inactive now defaults to t
-
-*** When Transient Mark mode is on, C-SPC C-SPC pushes a mark without
-activating it.
-
-*** When Transient Mark mode is on, M-q now fills the region if the
-region is active.  Otherwise, it fills the current paragraph.
-
-*** When Transient Mark mode is on, M-$ now checks spelling of the
-region if the region is active.  Otherwise, it checks spelling of the
-word at point.
-
-*** When Transient Mark mode is on, TAB now indents the region if the
-region is active.
-
-*** The variable `use-empty-active-region' controls whether an empty
-active region in Transient Mark mode should make commands operate on
-that empty region.
-
-** Temporarily active regions
-
-*** The new variable shift-select-mode, non-nil by default, controls
-shift-selection.  When Shift Select mode is on, shift-translated
-motion keys (e.g. S-left and S-down) activate and extend a temporary
-region, similar to mouse-selection.
-
-*** Temporarily active regions, created using shift-selection or
-mouse-selection, are not necessarily deactivated in the next command.
-They are only deactivated after point motion commands that are not
-shift-translated, or after commands that would ordinarily deactivate
-the mark in Transient Mark mode (e.g., any command that modifies the
-buffer).
-
-** Minibuffer and completion changes
-
-*** Emacs may ask for confirmation before opening a non-existent file
-or buffer.  By default, Emacs requests confirmation if you type RET
-immediately after TAB, and the resulting input is not an existing file
-or buffer; this usually happens when the minibuffer input did not
-complete far enough and you entered RET by mistake.  In that case,
-Emacs puts the message "[Confirm]" in the minibuffer; type RET again
-to create the file or buffer.
-
-The new variable confirm-nonexistent-file-or-buffer determines whether
-Emacs asks for confirmation.  The default value is `after-completion'.
-If you change it to t, Emacs always asks for confirmation; if you
-change it to nil, Emacs never asks for confirmation.
-
-*** The rules for performing completion have been changed.
-When generating completion alternatives, Emacs now takes the
-minibuffer text after point, if any, into account: this text is
-treated as a substring of the remaining part of the completion
-alternative (i.e., the part not matched by the minibuffer text before
-point).  If no completion alternatives are found this way, Emacs
-attempts to perform partial-completion.  If still no completion
-alternatives are found, we fall back on the Emacs 22 rules for
-performing completion.
-
-The new variable `completion-styles' can be customized to choose your
-favorite completion style.
-
-*** When M-n in the minibuffer reaches the end of the list of defaults,
-it adds the completion list to the end, so next M-n continues putting
-completion items to the minibuffer.  The same principle applies to
-incremental search commands as well: C-s or C-M-s starts searching
-the default values and after the end of defaults they continue
-searching minibuffer completion items.
-
-*** Minibuffer input of shell commands now comes with completion.
-
-*** In the `C-x d' (Dired) prompt, typing M-n gives the visited file
-name of the current buffer.
-
-*** In the M-! (shell-command) prompt, M-n provides some default commands.
-These are guessed using the file extension of the current file, based
-on the file-handlers specified in the operating system's `mailcap'
-file.  The ! command in Dired (dired-do-shell-command) works
-similarly, using the file displayed on the current line.
-
-*** A list of regexp default values is available via M-n for `occur',
-`keep-lines', `flush-lines' and `how-many'.  This list includes the active
-region in transient-mark-mode, the word under the cursor, the last Isearch
-regexp, the last Isearch string and the last replacement regexp.
-
-*** When enable-recursive-minibuffers is non-nil, operations which use
-switch-to-buffer (such as C-x b and C-x C-f) do not fail any more when
-used in a minibuffer or a dedicated window.  Instead, they fallback on
-using pop-to-buffer, which will use some other window.  This change
-has no effect when enable-recursive-minibuffers is nil (the default).
-
-*** Isearch started in the minibuffer searches in the minibuffer history.
-Reverse Isearch commands (C-r, C-M-r) search in previous minibuffer
-history elements, and forward Isearch commands (C-s, C-M-s) search in
-next history elements.  When the reverse search reaches the first history
-element, it wraps to the last history element, and the forward search
-wraps to the first history element.  When the search is terminated, the
-history element containing the search string becomes the current.
-
-*** The variable read-file-name-completion-ignore-case overrides
-completion-ignore-case for file name completion.
-
-*** The variable read-buffer-completion-ignore-case overrides
-completion-ignore-case for buffer name completion.
-
-*** The new command `minibuffer-force-complete' chooses one of the
-possible completions, rather than stopping at the common prefix.
-
-*** If `completion-auto-help' is `lazy', Emacs shows the completions
-buffer only on the second attempt to complete.  This was already
-supported in `partial-completion-mode'.
-
-** Face changes
-
-*** S-down-mouse-1 now pops up a menu for changing the font and text
-size of the default face in the current buffer.  The face is changed
-via face remapping (see Lisp changes, below).
-
-*** New commands to change the default face size in the current buffer.
-To increase it, type `C-x C-+' or `C-x C-='.  To decrease it, type
-`C-x C--'.  To restore the default (global) face size, type `C-x C-0'.
-These work via Text Scale mode, a new minor mode.
-
-The final key in the above commands may be repeated without the
-leading `C-x', e.g. `C-x C-= C-= C-=' increases the face height by
-three steps.  Each step scales the height of the default face by the
-value of the variable `text-scale-mode-step'.
-
-*** The commands buffer-face-mode and buffer-face-set can be used to
-remap the default face in the current buffer.  See "Buffer Face mode",
-under New Modes and Packages.
-
-** Primary selection changes
-
-*** You can disable kill ring commands from accessing the primary
-selection by setting `x-select-enable-primary' to nil.
-
-** Continuation lines can now be wrapped at word boundaries
-(word-wrapping).  This is controlled by the new per-buffer variable
-`word-wrap'.  Word wrapping does not take place if continuation lines
-are not shown, e.g. if truncate-lines is non-nil.  The most convenient
-way to enable word-wrapping is using the new minor mode Visual Line
-mode; in addition to setting `word-wrap' to t, this rebinds some
-editing commands to work on screen lines rather than text lines.  See
-New Modes and Packages, below.
-
-** Window management changes
-
-*** truncate-partial-width-windows now accepts integer values, which
-specify a minimum window width for partial-width windows, below which
-lines are truncated.  The default has been changed to 50.
-
-*** The new command balance-windows-area balances windows both
-vertically and horizontally.
-
-*** pop-to-buffer now always sets input focus when the popped-to window
-is on a different frame.
-
-** Miscellaneous changes:
-
-*** C-l is bound to the new command recenter-top-bottom, rather than recenter.
-This moves the current line to window center, top and bottom on
-successive invocations.
-
-*** scroll-preserve-screen-position also preserves the column position.
-
-*** If `yank-pop-change-selection' is t, rotating the kill ring also
-updates the selection or clipboard to the current yank, just as M-w
-would do so with the text it copies to the kill ring.
-
-*** C-M-% now shows replacement as it would look in the buffer, with
-`\N' and `\&' substituted according to the match.  Old behavior can be
-restored by customizing `query-replace-show-replacement'.
-
-*** The command shell prompts for the default directory, when it is
-called with a prefix and the default directory is a remote file name.
-This is because some file name handlers (like ange-ftp) are not able to
-run processes remotely.
-
-*** The new command kill-matching-buffers kills buffers whose name
-matches a regexp.
-
-*** The value of comment-style now defaults to `indent'.
-Thefore, comment-start markers are inserted at the current indentation
-of the region to comment, rather than the leftmost column.
-
-*** The new commands `pp-macroexpand-expression' and
-`pp-macroexpand-last-sexp' pretty-print macro expansions.
-
-*** The new command `set-file-modes' allows to set file's mode bits.
-The mode bits can be specified in symbolic notation, like with GNU
-Coreutils, in addition to an octal number.  `chmod' is a new
-convenience alias for this function.
-
-*** `next-error-recenter' specifies how next-error should recenter the
-visited source file.  Its value can be a number (for example, 0 for
-top line, -1 for bottom line), or nil for no recentering.
-
-*** When typing in a password in the echo area, C-y yanks the current
-kill into the password.
-
-*** Tooltip frame parameters `font' and `color' in `tooltip-frame-parameters'
-are ignored.  Customize the `tooltip' face instead.
-
-*** `mkdir' is a new convenience alias for `make-directory'.
-

-* New Modes and Packages in Emacs 23.1
-
-** Auto Composition Mode is a minor mode that composes characters
-automatically when they are displayed.  It is globally on by default.
-It uses `auto-composition-function' (default `auto-compose-chars').
-
-** Bubbles, a new game, is similar to SameGame.
-
-** Buffer Face mode is a minor mode for remapping the default face in
-the current buffer.  The variable `buffer-face-mode-face' specifies
-the face to remap to.  The command `buffer-face-set' prompts for a
-face name, sets `buffer-face-mode-face' to it, and enables
-buffer-face-mode.  See "Face changes", under Editing Changes, for a
-description of face remapping.
-
-** butterfly flips the desired bit on the drive platter.
-See http://xkcd.com/378/
-
-** bug-reference.el provides clickable links to bug reports.
-
-** dbus.el provides D-Bus language bindings.
-D-Bus is an inter-process communication mechanism for applications
-residing on the same host.  See the manual for details.
-
-** DocView mode allows viewing of PDF, PostScript and DVI documents.
-One can also search for a regular expression in the document.  For
-details, see the commentary in doc-view.el.
-
-PDF and DVI files are now opened in Doc View mode by default.
-
-In Postcript mode, C-c C-c launches Doc View minor mode for viewing
-the postscript file.
-
-** EasyPG provides an interface to the GNU Privacy Guard (GnuPG).
-It includes a GnuPG keyring browser, cryptographic operations on
-regions and files, and automatic encryption of *.gpg files.  For
-details, see the EasyPG Assistant User's Manual.
-
-** json.el is a library for parsing and generating JSON
-(JavaScript Object Notation), a lightweight data-interchange format.
-
-** linum.el is a new minor mode to display line numbers for the
-current buffer.
-
-** mairix.el is an interface to mairix, a free tool for indexing and
-searching locally stored mail.  It allows you to query mairix and
-display the search results with Rmail, Gnus and VM.  Note that there
-is an existing Gnus back end, nnmairix.el, which should be used with
-Maildir/MH setups.
-
-** minibuffer-depth-indicate-mode shows the minibuffer depth in the prompt.
-
-** nXML Mode
-This is a new mode for editing XML documents.  It allows a schema to
-be associated with the XML document being edited, using Relax NG as
-the schema language.  The schema is used to provide two key features:
-
-*** Continuous validation.  nXML validates as you type, highlighting
-any invalid parts of your document.
-
-*** Completion.  nXML can assist you in entering an element name,
-attribute name or data value by using information about what is
-allowed by the schema in that context.
-
-** proced.el provides a Dired-like interface for operating on
-processes.  Proced makes an Emacs buffer containing a listing of the
-current processes.  You can use the normal Emacs commands to move
-around in this buffer, and special Proced commands to operate on the
-processes listed.  It is currently only functional on GNU/Linux,
-MS-Windows and Solaris.
-
-** Remember Mode is a mode for jotting down things to remember.
-Notes can be saved to a Diary file.  For details, see the Remember
-Manual.
-
-** RST mode is a major mode for editing reStructuredText files.
-
-** Ruby mode is a major mode for Ruby files.
-
-** Visual Line mode provides support for editing by visual lines.
-It turns on word-wrapping in the current buffer, and rebinds C-a, C-e,
-and C-k to commands that operate by visual lines instead of logical
-lines.  This is a more reliable replacement for longlines-mode.
-This can also be turned on using the menu bar, via
-Options -> Line Wrapping in this Buffer -> Word Wrap
-
-** xesam.el is an implementation of Xesam, an interface to (desktop)
-search engines like Beagle, Strigi, and Tracker.  The Xesam API
-requires D-Bus for communication.
-
-** zeroconf.el offers service discovery and service publishing
-interfaces according to the zeroconf specification.  It communicates
-with Avahi, a zeroconf implementation, via D-Bus messages on systems
-which have installed this software.
-
-** There is a new `whitespace' package.
-(The pre-existing one has been renamed to `old-whitespace'.)
-Now, besides reporting bogus blanks, the whitespace package has a
-minor mode and a global minor mode to visualize blanks (TAB, (HARD)
-SPACE and NEWLINE).  The visualization is made via faces and/or display
-table.  It can also indicate lines that extend beyond a given column,
-trailing blanks, and empty lines at the start or end of a buffer.
-See `whitespace-style' for more details.  The `whitespace-action' option
-specifies what to do when a buffer is visited, killed, or written.
-
-

-* Changes in Specialized Modes and Packages in Emacs 23.1
-
-** Abbrev has been rewritten in Elisp and extended with more flexibility.
-
-*** New functions: abbrev-get, abbrev-put, abbrev-table-get, abbrev-table-put,
-abbrev-table-p, abbrev-insert, abbrev-table-menu.
-
-*** Special hook `abbrev-expand-functions' obsoletes `pre-abbrev-expand-hook'.
-
-*** `make-abbrev-table', `define-abbrev', `define-abbrev-table' all take
-extra arguments for arbitrary properties.
-
-*** New variable `abbrev-minor-mode-table-alist'.
-
-*** `local-abbrev-table' can hold a list of abbrev-tables.
-
-*** Abbrevs have now the following special properties:
-`:count', `:system', `:enable-function', `:case-fixed'.
-
-*** Abbrev-tables have now the following special properties:
-`:parents', `:case-fixed', `:enable-function', `:regexp',
-`abbrev-table-modiff'.
-
-** Apropos
-
-*** `apropos-library' describes the elements defined in a given library.
-
-*** Set `apropos-compact-layout' is you want a more compact (but wider) layout.
-
-** Archive Mode has basic support to browse Rar archives.
-Note, however, that the free version of the unrar command only handles
-versions 1 and 2 of the Rar format.
-
-** BibTeX mode
-
-*** New command `bibtex-initialize' (re)initializes BibTeX buffers.
-
-*** New `bibtex-entry-format' options `whitespace', `braces', and
-`string', disabled by default.
-
-*** New variable `bibtex-cite-matcher-alist' contains rules to
-identify cited keys in BibTeX entries, used by `bibtex-find-crossref'.
-
-*** Command `bibtex-url' allows multiple URLs per entry.
-
-** Bookmarks
-
-*** bookmark.el saves bookmarks in a pre-Emacs-23-incompatible file format
-bookmark.el can read a .emacs.bmk file saved by an older Emacs, but an
-older Emacs cannot read one saved by Emacs 23.
-
-** Calendar and diary
-
-*** There is a new date style, `iso', essentially year/month/day.
-The variable `european-calendar-style' is obsolete - use `calendar-date-style'.
-Similarly, the commands `american-calendar' and `european-calendar'
-should be replaced by `calendar-set-date-style'.
-
-*** The calendar namespace has been rationalized.
-All functions and variables now begin with a `calendar-', `diary-', or
-`holiday-' prefix.  The various calendar systems have secondary
-prefixes, eg `calendar-french-'.  The old names you are likely to use
-directly still exist, for the time being, as aliases, but please start
-using the new names.
-
-*** The whitespace in the calendar layout can be customized.
-See the variables:
-calendar-left-margin, calendar-intermonth-spacing, calendar-column-width,
-calendar-day-header-width, and calendar-day-digit-width.
-
-*** Text (e.g. ISO weeks) can be displayed between the calendar months.
-See the variables calendar-intermonth-header and calendar-intermonth-text.
-
-*** The function `holiday-chinese' computes holidays on the Chinese calendar.
-It has been used to add items to the list `holiday-oriental-holidays'.
-
-*** `diary-remind' accepts a negative number -DAYS as a shorthand for
-the list (1 2 ... DAYS).
-
-** Change Log mode
-
-*** The new command C-c C-f (change-log-find-file) finds the file
-associated with the current log entry.
-
-*** The new command C-c C-c (change-log-goto-source) goes to the
-source code associated with a log entry.
-
-** Compile and grep modes
-
-*** The mode-line entry for the *compilation* and *grep* buffer is color coded.
-It has different colors for to show that: (a) the command is still
-running, (b) successful completion, (c) error.
-
-*** compilation-auto-jump-to-first-error tells `compile' to jump to
-the first error encountered during compilations.
-
-*** compilation-scroll-output accepts a new value, `first-error', which
-says to stop auto scrolling at the first error that occurs.
-
-*** The `cc' alias for C++ files in `grep-file-aliases' has been
-improved.  `hh' can be used to match C++ header files and `cchh' both
-C++ sources and headers.
-
-** Copyright
-
-*** You can specify your copyright holders' names.
-Only copyright lines with holders matching `copyright-names-regexp' are
-considered for update.
-
-*** Copyrights can be at the end of the buffer.
-This is controlled by `copyright-at-end-flag' (used by, e.g., change-log-mode).
-
-** Custom
-
-*** defcustom accepts new keyword arguments, `:safe' and `:risky', which
-set a variable's `safe-local-variable' and `risky-local-variable' property.
-
-** Diff mode
-
-*** diff-refine-hunk highlights word-level details of changes in a diff hunk.
-It's used automatically as you move through hunks, see
-diff-auto-refine-mode.  It is bound to `C-c C-b'.
-
-*** diff-add-change-log-entries-other-window iterates through the diff
-buffer and tries to create ChangeLog entries for each change.
-It is bound to `C-x 4 A'.
-
-*** Turning on `whitespace-mode' in a diff buffer will show trailing
-whitespace problems in the modified lines.
-
-** Dired
-
-*** In Dired, C-x C-q now runs the command wdired-change-to-wdired-mode,
-and C-x C-q in wdired-mode exits it with asking a question about
-saving changes.
-
-*** `&' runs the command `dired-do-async-shell-command' that executes
-the command asynchronously without the need to manually add ampersand
-to the end of the command.  Its output appears in the buffer `*Async Shell
-Command*'.
-
-*** `M-s f C-s' and `M-s f M-C-s' run Isearch that matches only at file names.
-When a new user option `dired-isearch-filenames' is t, then even ordinary
-Isearch started with `C-s' and `C-M-s' matches only at file names in the
-Dired buffer.  When `dired-isearch-filenames' is `dwim' then activation of
-file name Isearch depends on the position of point - if point is on a file
-name initially, then Isearch matches only file names, otherwise it matches
-everywhere in the Dired buffer.  You can toggle file names matching on or
-off by typing `M-s f' in Isearch mode.
-
-*** `M-s a C-s' and `M-s a M-C-s' run multi-file Isearch on the marked files.
-They visit the first marked file in the sequence and display the usual Isearch
-prompt for a string or a regexp where all Isearch commands are available.
-
-*** `Q' in Dired provides two new keys for multi-file replacement.
-The upper case key `Y' replaces all remaining matches in all remaining files
-with no more questions.  The upper case key `N' stops doing replacements
-in the current file and skips to the next file.  These multi-file keys
-are available for all commands that use `tags-query-replace'
-including `dired-do-query-replace-regexp', `vc-dir-query-replace-regexp',
-`reftex-query-replace-document'.
-
-** Fortran
-
-*** The line length of fixed-form Fortran is not fixed at 72 any more.
-Customize the variable `fortran-line-length' to change it.
-
-*** In Fortran mode, M-; is now bound to the standard comment-dwim,
-rather than fortran-indent-comment.
-
-*** (The increasingly misnamed) F90 mode supports Fortran 2003 syntax.
-
-** Gnus
-
-*** The Gnus package has been updated
-There are many new features, bug fixes and improvements; see the file
-GNUS-NEWS or the node "No Gnus" in the Gnus manual for details.
-
-*** In Emacs 23, Gnus uses Emacs' new internal coding system `utf-8-emacs' for
-saving articles, drafts, and ~/.newsrc.eld.  These file may not be read
-correctly in Emacs 22 and below.  If you want to Gnus across different Emacs
-versions, you may set `mm-auto-save-coding-system' to `emacs-mule'.
-
-*** Passwords are consistently loaded through `auth-source'
-Gnus can use `auth-source' for POP and IMAP passwords.  Also see that
-`smtpmail' and `url' support `auth-source' for SMTP and HTTP/HTTPS/RSS
-authentication respectively.
-
-** Help mode
-
-*** New macro `with-help-window' should set up help windows better
-than `with-output-to-temp-buffer' with `print-help-return-message'.
-
-*** New option `help-window-select' permits to customize whether help
-window shall be automatically selected when invoking help.
-
-*** New variable `help-window-point-marker' permits one to specify a new
-position for point in help window (for example in `view-lossage').
-
-** Isearch
-
-*** New command `isearch-forward-word' bound globally to `M-s w' starts
-incremental word search.  New command `isearch-toggle-word' bound to the
-same key `M-s w' in Isearch mode toggles word searching on or off
-while Isearch is active.
-
-*** New command `isearch-highlight-regexp' bound to `M-s h r' in Isearch
-mode runs `highlight-regexp' (`hi-lock-face-buffer') with the current
-search string as its regexp argument.  The same key `M-s h r' and
-other keys on the `M-s h' prefix are bound globally to the command
-`highlight-regexp' and other hi-lock commands.
-
-*** New command `isearch-occur' bound to `M-s o' in Isearch mode
-runs `occur' with the current search string.  The same key `M-s o'
-is bound globally to the command `occur'.
-
-*** Isearch can now search through multiple ChangeLog files.
-When running Isearch in a ChangeLog file, if the search fails,
-then another C-s tries searching the previous ChangeLog,
-if there is one (e.g. going from ChangeLog to ChangeLog.12).
-This is enabled if multi-isearch-search is non-nil.
-
-*** Two new commands to start Isearch on a list of marked buffers
-for buff-menu.el and ibuffer.el are bound to the keys `M-s a C-s' and
-`M-s a M-C-s'.
-
-*** The part of an Isearch that failed to match is highlighted in
-`isearch-fail' face.
-
-*** `C-h C-h' in Isearch mode displays isearch-specific Help screen,
-`C-h b' displays all Isearch key bindings, `C-h k' displays the full
-documentation of the given Isearch key sequence, `C-h m' displays
-documentation for Isearch mode.  All the other Help commands exit
-Isearch mode and execute their global definitions.
-
-*** When started in the minibuffer, Isearch searches in the minibuffer
-history.  See `Minibuffer changes', above.
-
-** MH-E
-
-*** Upgraded to MH-E version 8.2.  See MH-E-NEWS for details.
-
-** Python
-*** The file etc/emacs.py now supports both Python 2 and 3, meaning
-that either version can be used as inferior Python by python.el.
-
-*** Python mode now has `pdbtrack' functionality.  When using pdb to
-debug a Python program, pdbtrack notices the pdb prompt and displays
-the source file and line that the program is stopped at, much the same
-way as gud-mode does for debugging C programs with gdb.
-
-** Recentf
-
-*** The default value of `recentf-keep' prevents from checking of
-remote files, if there is no established connection to the
-corresponding remote host.
-
-** Rmail
-
-*** Rmail no longer converts the messages to Babyl format.
-Instead, it uses UNIX mbox format, both on disk and in Rmail buffers,
-and does conversion and decoding when a message is displayed.
-
-The first time you visit an Rmail file in Babyl format, Rmail
-automatically converts it to mbox format.  This is a one-time
-conversion, but it can take a few minutes, depending on how fast is
-your machine and on the size of the file.  You should find the rest of
-Rmail usage unaltered.
-
-However, M-x set-rmail-inbox-list now lasts only for one session
-because there is no way to save the list of inbox files in an
-mbox-format file.
-
-Also, whereas with Babyl format M-x find-file would switch to Rmail
-mode, with mbox format this is no longer the case (there being no way
-to add an "-*- rmail-*-" cookie to an mbox file).  Use C-u M-x rmail
-instead.
-
-If you have written any extensions to Rmail, they are likely to need
-updating.  Conceptually, the Rmail buffer that you see is no longer
-just a narrowed portion of the whole.  So you cannot access the whole
-of a message (or message collection) by a simple save-restriction and
-widen.  Instead, there are two buffers: the rmail-buffer, and the
-rmail-view-buffer.  The former is the buffer that you see, the latter
-is invisible.  Most of the time, the invisible `view' buffer contains
-the full contents of the Rmail file, and the Rmail buffer contains a
-decoded copy of the current message (with only a subset of the
-headers).  In this state, Rmail is said to be `swapped'.
-
-You may find the following functions useful:
-
-`rmail-get-header' and `rmail-set-header' get or set the value of a
-message header, whether or not it is currently visible.
-
-`rmail-apply-in-message' is a general purpose function that calls a
-function (with arguments) which you specify on the full text of a given
-message.  To further narrow to just the headers, search forward for "\n\n".
-
-*** The new command `rmail-mime' displays MIME messages.
-It is bound to `v' in Rmail buffers and summaries.  It displays plain
-text and multipart messages in a temporary buffer, and offers buttons
-to save attachments.
-
-*** The command `rmail-redecode-body' no longer accepts the optional arg RAW.
-Since Rmail now holds messages in their original undecoded form in a
-separate buffer, `rmail-redecode-body' no longer encodes the original
-message, and therefore there should be no need to avoid encoding it.
-
-*** The o command is now `rmail-output'.  It is an all-purpose command
-for copying messages from Rmail and appending them to files.  It
-handles Babyl-format files as well as mbox-format files, and it
-handles both kinds properly when they are visited in Emacs.  It always
-copies the full headers of the message.
-
-*** The C-o command is now `rmail-output-as-seen'.  It uses
-the message as displayed, appending it to an mbox file.
-
-*** The modified status of the Rmail buffer is reported in the mode-line.
-Previously, this information was hidden.
-
-** TeX modes
-
-*** New option latex-indent-within-escaped-parens
-permits to customize indentation of LaTeX environments delimited
-by escaped parens.
-
-** T-mouse Mode
-
-*** If the gpm mouse server is running and t-mouse-mode is enabled,
-Emacs uses a Unix socket in a GNU/Linux console to talk to server,
-rather than faking events using the client program mev.  This C level
-approach provides mouse highlighting and help echoing in the
-minibuffer.
-
-** Tramp
-
-*** New connection methods.
-The new methods "plinkx", "plink2", "psftp", "sftp" and "fish" have
-been introduced.  There are also new so-called gateway methods
-"tunnel" and "socks".
-
-*** IPv6 addresses.
-IPv6 addresses are supported now as host names.  They must be embedded
-in square brackets, like in "/ssh:[::1]:".
-
-*** Multihop syntax has been removed.
-The pseudo-method "multi" has been removed.  Instead, multi hops
-can be specified by the new variable `tramp-default-proxies-alist'.
-
-*** More default settings.
-Default values can be set via the variables `tramp-default-user',
-`tramp-default-user-alist' and `tramp-default-host'.
-
-*** Connection information is cached.
-In order to reduce connection setup, information about used
-connections is kept persistently in a file.  The name of this file is
-defined in the variable `tramp-persistency-file-name'.
-
-*** Control of remote processes.
-Running processes on a remote host can be controlled by settings in
-`tramp-remote-path' and `tramp-remote-process-environment'.
-
-*** Success of remote copy is checked.
-When the variable `file-precious-flag' is set, the success of a remote
-file copy is checked via the file's checksum.
-
-*** Passwords can be read from an authentification file.
-Tramp uses the package `auth-source' to read passwords from a file, if
-necessary.
-
-** VC and related modes
-
-*** VC now supports applying VC operations to a set of files at a time.
-This enables VC to work much more effectively with changeset-oriented
-version-control systems such as Subversion, GNU Arch, Mercurial, Git
-and Bzr.  VC will now pass a multiple-file commit to these systems as
-a single changeset.
-
-*** vc-dir is a new command that displays file names and their VC
-status.  It allows to apply various VC operations to a file, a
-directory or a set of files/directories.
-
-*** VC switches are no longer appended, rather the first non-nil value is used.
-(This was for the most part true in Emacs 22, but was not advertised).
-This is because there is an increasing variety of VC systems, and they
-do not all accept the same "common" options.  For example, a CVS diff
-command used to append the values of `vc-cvs-diff-switches',
-`vc-diff-switches', and `diff-switches'.  Now the first non-nil value
-from that sequence is used.  The special value `t' means "no switches".
-
-*** Clicking on the VC mode-line entry now pops the VC menu.
-
-*** The VC mode-line entry now has a tooltip that explains the VC file status.
-
-*** In VC Annotate mode, the key bindings have changed to use lower
-case keys instead of the upper case keys used in the past.
-
-*** In VC Annotate mode, for VC systems that support changesets, you can
-see the diff for the whole changeset (not only for the current file)
-by typing the D key.  Using the "Show changeset diff of revision at
-line" menu entry does the same thing.
-
-*** In VC Annotate mode, you can type v to toggle the annotation visibility.
-
-*** In VC Annotate mode, you can type f to show the file revision on
-the current line.
-
-*** Asynchronous VC commands display [Waiting...] in the mode-line
-of the corresponding buffer as long as the asynchronous process is
-active.
-
-*** Log entries can be modified using the key "e" in log-view.
-For now only CVS, RCS, SCCS and SVN support this functionality.
-This is done by the `modify-change-comment' backend function.
-
-*** In log-view-mode, for VC systems that support changesets, you can
-see the diff for the whole changeset (not only for the current file)
-by typing the D key or using the "Changeset Diff" menu entry.
-
-*** In Log Edit mode,  C-c C-d now shows the diff for the files involved.
-
-*** vc-git supports the "git grep" command.
-
-*** VC Support for Meta-CVS has been removed for lack of a maintainer able
-to update it to the new VC.
-
-** Miscellaneous
-
-*** comint-mode uses `start-file-process' now (see Lisp Changes).
-If `default-directory' is a remote file name, subprocesses are started
-on the corresponding remote system.
-
-*** Eldoc highlights the function argument under point
-with the face `eldoc-highlight-function-argument'.
-
-*** In Etags, the --members option is now the default.
-Use --no-members if you want the old default behavior of not tagging
-struct members in C, members variables in C++ and variables in PHP.
-
-*** The `gdb' command only works with the graphical interface now.
-Use `gud-gdb' if you want the (old) text command mode.
-
-*** goto-address.el provides two new minor modes, goto-address-mode and
-goto-address-prog-mode, which buttonize URLS and email addresses.
-
-*** The new command `eshell/info' runs info in an eshell buffer.
-
-*** The new variable `ffap-rfc-directories' specifies a list of local
-directories in which `ffap-rfc' will first search for RFCs.
-
-*** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them.
-See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'.
-
-*** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'.
-
-*** Info displays breadcrumbs in the header of the page.
-See Info-breadcrumbs-depth to control it.
-
-*** net-utils has an `iwconfig' command, similar to the existing `ifconfig'.
-It is used to configure wireless interfaces.
-
-*** The pcmpl-unix package supports hostname completion for ssh and scp.
-
-*** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag pairs.
-
-*** smerge-refine highlights word-level details of changes in conflict.
-It's used automatically as you move through conflicts, see
-smerge-auto-refine-mode.
-
-*** talk.el has been extended for multiple tty support.
-
-*** A new command `display-time-world' has been added to the Time
-package.  It creates a buffer with an updating time display using
-several time zones.
-
-*** The appearance of superscript and subscript in TeX is more customizable.
-See the documentation of the variables: tex-fontify-script,
-tex-font-script-display, tex-suscript-height-ratio, and
-tex-suscript-height-minimum.
-
-*** view-remove-frame-by-deleting is now by default t
-since users found iconification of view-mode frames distracting.
-
-*** WoMan tries to add locale-specific manual page directories to the
-search path.  This can be disabled by setting `woman-locale' to nil.
-
-

-* Changes in Emacs 23.1 on non-free operating systems
-
-** Case is now considered significant in completion on MS-Windows.
-The default value of `completion-ignore-case' is now nil on
-MS-Windows, the same as it is for other operating systems.  The
-variable doesn't apply to reading a file name -- in that case Emacs
-heeds `read-file-name-completion-ignore-case' instead.
-
-** IPv6 is supported on MS-Windows.
-Emacs now supports IPv6 on Windows XP and later, and earlier versions
-of Windows with third party IPv6 stacks installed.  In Emacs 22, IPv6 was
-supported on other platforms, but not on Windows due to using the winsock
-1.1 header file, even though Emacs was linking to the winsock 2 library.
-
-** Busy cursor (hourglass) now displays on MS-Windows.
-When Emacs is busy, an hourglass mouse cursor is displayed on Windows.
-In Emacs 22 only X supported the busy cursor.
-
-** Battery status is available on MS-Windows
-Emacs can now display the battery status in the mode-line when enabled with
-display-battery-mode or from the Options menu.  More verbose battery
-information is also available with the command `battery'.  In Emacs 22
-battery status was supported only on GNU/Linux and Mac.
-
-** More keys available on MS-Windows.
-Keys normally associated with IMEs, and some exotic keys not normally found
-on standard keyboards have been given names so they can be bound to functions
-inside Emacs.  If there are keys on your keyboard that have not been exposed
-to Emacs in the past, try C-h k to see if they are available now.
-
-Emacs can now bind functions to the extra buttons for media player and
-browser control present on some keyboards.  These buttons are disabled
-by default, since enabling them prevents their system-wide use when
-Emacs has focus.  To enable them, set the variable
-w32-pass-multimedia-buttons to nil.  See the doc string of that variable
-for the list of extra keys that are available.
-
-** BDF fonts no longer supported on MS-Windows.
-The font backend was completely rewritten for this release.  The focus
-on Windows has been getting acceptable performance and full unicode
-support, including complex script shaping for native Windows fonts.  A
-rewrite of the BDF font support has not happened due to lack of time
-and developers.  If demand still exists for such a backend even with
-the improved language support for native Windows fonts, future
-development in this direction will most likely be based on the
-freetype library, giving access to a wider range of font formats.
-
-

-* Incompatible Lisp Changes in Emacs 23.1
-
-** Variables cannot be both buffer-local and frame-local any more.
-
-** `functionp' returns nil for special forms.
-I.e., it only returns t for objects that can be passed to `funcall'.
-
-** The behavior of map-char-table has changed.  It may call the
-specified function with a cons (FROM . TO) as a key if characters in
-that range have the same value.
-
-** Process changes
-
-*** The function `dired-call-process' has been removed.
-
-*** The multibyteness of process filters is now determined by the
-coding-system used for decoding.  The functions
-`process-filter-multibyte-p' and `set-process-filter-multibyte' are
-obsolete.
-
-** The variable `byte-compile-warnings' can now be a list starting with `not',
-meaning to disable the specified warnings.  The meaning of this list
-may therefore be the reverse of what you expect (of course, this is
-only an issue if you make use of the new `not' syntax).  Rather than
-checking/manipulating elements directly, use the new functions
-`byte-compile-warning-enabled-p', `byte-compile-disable-warning', and
-`byte-compile-enable-warning.'
-
-** `mode-name' is no longer guaranteed to be a string.
-Use `(format-mode-line mode-name)' to ensure a string value.
-
-** The function x-font-family-list has been removed.
-Use the new function font-family-list (see Lisp Changes, below).
-
-** Internationalization changes
-
-*** The value of the function `charset-id' is now always 0.
-
-*** The functions `register-char-codings' and `coding-system-spec'
-have been removed.
-
-*** The cpXXX coding systems are now supported automatically.
-The functions cp-...-codepage, which you had to use in Emacs 22 to
-enable support for these coding systems, have been deleted.
-
-*** The following features have been removed.  They were used for
-displaying various scripts with specific fonts, and are no longer
-needed now that OpenType font support is available:
-
-**** `devanagari' and `devan-util', and all associated devanagari-* and
-dev-* functions and variables (formerly used for Devanagari script).
-
-**** `kannada' and `knd-util', and all associated kannada-* and knd-*
-functions and variables (formerly used for Kannada script).
-
-**** `malayalam' and `mlm-util', and all associated malayalam-* and
-mlm-* functions and variables (formerly used for Malayalam script).
-
-**** `tamil' and `tml-util, and all associated tamil-* and tml-*
-functions and variables (formerly used for Tamil script).
-
-*** The meaning of NAME argument of `set-fontset-font' is changed.
-Previously nil is accepted as the default fontset.  Now, nil is for
-the fontset of the selected frame and t is for the default fontset.
-
-*** The meaning of FONTSET argument of `print-fontset' is changed.
-Now, nil is for the fontset of the selected frame and t is for the
-default fontset.
-
-** If a function in write-region-annotate-functions returns with a
-different buffer current, Emacs no longer kills that buffer
-automatically.  This behavior existed in previous versions of Emacs,
-but was undocumented.  To kill a buffer after write-region, give the
-variable `write-region-post-annotation-function' a buffer-local value
-of `kill-buffer'.
-
-** The variable temp-file-name-pattern has been removed.
-This variable was only used by call-process-region, which now uses
-temporary-file-directory instead.
-
-** The COUNT and SYSTEM-FLAG arguments to define-abbrev have been
-removed.  The function now takes extra arguments for specifying
-arbitrary abbrev properties.
-
-** end-of-defun-function is now guaranteed to work only when called
-from the start of a defun.  It must now leave point exactly at the end
-of defun, since `end-of-defun' now itself moves forward over
-whitespace after calling it.
-
-

-* Lisp Changes in Emacs 23.1
-
-** The new variable `generate-autoload-cookie' controls the magic comment
-string used by `update-file-autoloads' to find autoloaded forms.  The
-variable `generated-autoload-file' similarly controls the name of the
-file where `update-file-autoloads' writes the calls to `autoload'.
-The default values are ";;;###autoload" and `loaddefs.el',
-respectively.
-
-** New primitives `list-system-processes' and `process-attributes'
-let Lisp programs access the processes that are running on the local
-machine.  See the doc strings of these functions for more details.
-Not all platforms support accessing this information; on those that
-don't, these primitives will return nil.
-
-** New variable `user-emacs-directory'.
-Use this instead of "~/.emacs.d".
-
-** If a local hook function has a non-nil `permanent-local-hook'
-property, `kill-all-local-variables' does not remove it from the local
-value of the hook variable; it remains even if you change major modes.
-
-** `frame-inherited-parameters' lets new frames inherit parameters from
-the selected frame.
-
-** New keymap `input-decode-map' overrides like key-translation-map, but
-applies before function-key-map.  Also it is terminal-local contrary to
-key-translation-map.  Terminal-specific key-sequences are generally added to
-this map rather than to function-key-map now.
-
-** `ignore-errors' is now a standard macro (does not require the CL package).
-
-** `interprogram-paste-function' can now return one string or a list
-of strings.  In the latter case, Emacs puts the second and following
-strings on the kill ring.
-
-** In `condition-case', a handler can specify "let the debugger run first".
-You do this by writing `debug' in the list of conditions to be handled,
-like this:
-
-    (condition-case nil
-	(foo bar)
-      ((debug error) nil))
-
-** clone-indirect-buffer now runs the clone-indirect-buffer-hook.
-
-** `beginning-of-defun-function' now takes one argument, the count given to
-`beginning-of-defun'.  (N.B. `end-of-defun-function' doesn't take any
-arguments.)
-
-** `file-remote-p' has new optional parameters IDENTIFICATION and CONNECTED.
-IDENTIFICATION specifies which part of the remote identifier has to be
-returned.  With CONNECTED passed non-nil, it is checked whether a
-remote connection has been established already.
-
-** The new macro `declare-function' suppresses compiler warnings about
-undefined functions.
-
-** Changes to interactive function handling
-
-*** The new interactive spec code ^ says to first call
-handle-shift-selection if shift-select-mode is non-nil, before reading
-the command arguments.  This is used for shift-selection (see above).
-
-*** Built-in functions can now have an interactive specification that
-is not a prompt string.  If the `intspec' parameter of a `DEFUN'
-starts with a `(', the string is evaluated as a Lisp form.
-
-*** The interactive-form of a function can be added post-facto via the
-`interactive-form' symbol property.  Mostly useful to add complex
-interactive forms to subroutines.
-
-** Region changes
-
-*** Commands should use `use-region-p' to test whether there is
-an active region that they should operate on.
-
-*** `region-active-p' returns non-nil when Transient Mark mode is
-enabled and the mark is active.  Most commands that act specially on
-the active region in Transient Mark mode should use `use-region-p'
-instead of `region-active-p', because `use-region-p' obeys the new
-user option `use-empty-active-region' (see Editing Changes, above).
-
-*** If a command sets `transient-mark-mode' to (only . OLDVAL), that
-means to activate transient-mark-mode temporarily, until the next
-unshifted point motion command or mark deactivation.  Afterwards,
-reset transient-mark-mode to the value OLDVAL.  The values `only' and
-`identity', introduced in Emacs 22, are now deprecated.
-
-** Emacs session information
-
-*** The new variables `before-init-time' and `after-init-time' record the
-value of `current-time' before and after Emacs loads the init files.
-
-*** The new function `emacs-uptime' returns the uptime of an Emacs instance.
-
-*** The new function `emacs-init-time' returns the duration of the
-Emacs initialization.
-
-** Changes affecting display-buffer
-
-*** display-buffer tries to be smarter when splitting windows.
-The new option split-window-preferred-function lets you specify your own
-function to pop up new windows.  Its default value split-window-sensibly
-can split a window either vertically or horizontally, whichever seems
-more suitable in the current configuration.  You can tune the behavior
-of split-window-sensibly by customizing split-height-threshold and the
-new option split-width-threshold.  Both options now take the value nil
-to inhibit splitting in one direction.  Setting split-width-threshold to
-nil inhibits horizontal splitting and gets you the behavior of Emacs 22
-in this respect.  In any case, display-buffer may now split the largest
-window vertically even when it is not as wide as the containing frame.
-
-*** If pop-up-frames has the value `graphic-only', display-buffer only
-makes a separate frame on graphic displays.
-
-*** select-frame and set-frame-selected-window have a new optional
-argument NORECORD.  If non-nil, this will avoid messing with the order
-of recently selected windows and the buffer list.
-
-** Window parameters can now be defined.
-These are analogous to frame parameters, but are associated with
-individual windows.
-
-*** The new functions window-parameters, window-parameter, and
-set-window-parameter are used to query and set window parameters.
-
-** Minibuffer and completion changes
-
-*** A list of default values can be specified for the DEFAULT argument of
-functions `read-from-minibuffer', `read-string', `read-command',
-`read-variable', `read-buffer', `completing-read'.  Elements of this list
-are available for inserting into the minibuffer by typing `M-n'.
-For empty input these functions return the first element of this list.
-
-*** New function `read-regexp' uses the regexp history and some useful
-regexp defaults (string at point, last Isearch/replacement regexp/string)
-via M-n when reading a regexp in the minibuffer.
-
-*** minibuffer-local-must-match-filename-map is now named
-minibuffer-local-filename-must-match-map.
-
-*** The `require-match' argument to `completing-read' accepts the new
-values `confirm-only' and `confirm-after-completion'.
-
-** Search and replacement changes
-
-*** The regexp form \(?<num>:<regexp>\) specifies the group number explicitly.
-
-*** New function `match-substitute-replacement' returns the result of
-`replace-match' without actually using it in the buffer.
-
-*** The new variable `replace-search-function' determines the function
-to use for searching in query-replace and replace-string.  The
-function it specifies is called by `perform-replace' when its 4th
-argument is nil.
-
-*** The new variable `replace-re-search-function' determines the
-function to use for searching in `query-replace-regexp',
-`replace-regexp', `query-replace-regexp-eval', and
-`map-query-replace-regexp'.  The function it specifies is called by
-`perform-replace' when its 4th argument is non-nil.
-
-*** New keymap `search-map' bound to `M-s' provides global bindings
-for search related commands.
-
-*** New keymap `multi-query-replace-map' contains additonal keys bound
-to `automatic-all' and `exit-current' for multi-buffer interactive replacement.
-
-*** The variable `inhibit-changing-match-data', if non-nil, prevents
-the search and match primitives from changing the match data.
-
-*** New functions `word-search-forward-lax' and `word-search-backward-lax'.
-These are like `word-search-forward and `word-search-backward', except
-that the end of the search string need not match a word boundary,
-unless it ends in whitespace.
-
-** File handling changes
-
-*** set-file-modes is now interactive and can take the mode value in
-symbolic notation thanks to auxiliary functions.
-
-*** file-local-variables-alist stores an alist of file-local
-variables defined in the current buffer.
-
-** Face-remapping
-
-*** Each face can be remapped to a different face definition using the
-variable `face-remapping-alist'.  This is an alist that maps faces to
-replacement definitions (which can be face names, lists of face names,
-or attribute/value plists.  If this variable is buffer-local, the
-remapping occurs only in that buffer.
-
-*** text-scale-mode remaps the default face to a larger or smaller
-size in the current buffer.  This feature is used by the Buffer Face
-menu and the new `C-x C-+', `C-x C--', and `C-x C-0' commands (see
-Editing Changes, above).
-
-*** New functions:
-
-**** `face-remap-add-relative' adds a face remapping entry to the
-current buffer.
-
-**** ``face-remap-remove-relative' removes a face remapping entry from
-the current buffer.
-
-**** `face-remap-reset-base' restores a face to its global definition.
-
-**** `face-remap-set-base' sets the base remapping of a face.
-
-** Process changes
-
-*** The new function `start-file-process' is similar to `start-process',
-but obeys file handlers.  The file handler is chosen based on
-`default-directory'.  The functions `start-file-process-shell-command'
-and `process-file-shell-command' are also new; they call internally
-`start-file-process' and `process-file', respectively.
-
-*** The new function `process-lines' executes an external program and
-returns its output as a list of lines.
-
-** Character code, representation, and charset changes.
-
-*** In multibyte buffers and strings, characters are represented by
-UTF-8 byte sequences.  The character code space is now 0x0..0x3FFFFF
-with no gap; code points 0x0..0x10FFFF are Unicode characters of the
-same code points, while code points 0x3FFF80..0x3FFFFF are raw 8-bit
-bytes.
-
-*** Generic characters no longer exist.
-
-*** The concept of a charset has changed.  A single character may
-belong to multiple charsets (e.g. a-grave, U+00E0, belongs to charsets
-unicode, iso-8859-1, iso-8859-3, etc).
-
-**** The dimension of a charset is now 1, 2, 3, or 4, and the size of
-each dimension is no longer limited to 94 or 96.
-
-**** A dynamic charset priority list is used to infer the charset of
-characters for display.
-
-*** The functions `split-char' and `make-char' now accept up to 4
-positional codes instead of just 2.
-
-*** The functions `encode-char' and `decode-char' now accept any character sets.
-
-*** The function `define-charset' now accepts a completely different
-form of arguments (old-style arguments still work).
-
-*** The value of the function `char-charset' depends on the current
-priorities of charsets.
-
-*** The function get-char-code-property now accepts many Unicode base
-character properties.  They are `name', `general-category',
-`canonical-combining-class', `bidi-class', `decomposition',
-`decimal-digit-value', `digit-value', `numeric-value', `mirrored',
-`old-name', `iso-10646-comment', `uppercase', `lowercase', and
-`titlecase'.
-
-*** The functions `modify-syntax-entry' and `modify-category-entry' now
-accept a cons of characters as the first argument, and modify all
-entries in that range of characters.
-
-*** Use of `translation-table-for-input' for character code unification
-is now obsolete, since Emacs 23.1 and later uses Unicode as basis for
-internal representation of characters.
-
-*** New functions:
-
-**** `characterp' returns t if and only if the argument is a character.
-This replaces `char-valid-p', which is now obsolete.
-
-**** `max-char' returns the maximum character code (currently #x3FFFFF).
-
-**** `define-charset-alias' defines an alias of a charset.
-
-**** `set-charset-priority' sets priorities of charsets.
-
-**** `charset-priority-list' returns a prioritized list of charsets.
-
-**** `unibyte-string' makes a unibyte string from bytes.
-
-**** `define-char-code-property' defines a character code property.
-
-**** `char-code-property-description' returns the description string of
-a character code property.
-
-*** New variables:
-
-**** `find-word-boundary-function-table' is a char-table of functions to
-search for a word boundary.
-
-**** `char-script-table' is a char-table of script names.
-
-**** `char-width-table' is a char-table of character widths.
-
-**** `print-charset-text-property' controls how to handle `charset' text
-property on printing a string.
-
-**** `printable-chars' is a char-table of printable characters.
-
-** Code conversion changes
-
-*** The new function `define-coding-system' should be used to define a
-coding system instead of `make-coding-system' (which is now obsolete).
-
-*** The functions `encode-coding-region' and `decode-coding-region'
-have an optional 4th argument to specify where the result of
-conversion should go.
-
-*** The functions `encode-coding-string' and `decode-coding-string'
-have an optional 4th argument specifying a buffer to store the result
-of conversion.
-
-*** The new variable `inhibit-null-byte-detection' controls whether to
-consider text with null bytes as binary data.  By default, it is
-`nil', and Emacs uses `no-conversion' for any text containing null
-bytes.
-
-*** The functions `set-coding-priority' and `make-coding-system' are obsolete.
-
-*** New functions:
-
-**** `with-coding-priority' executes Lisp code using the specified
-coding system priority order.
-
-**** `check-coding-systems-region' checks if the text in the region is
-encodable by the specified coding systems.
-
-**** `coding-system-aliases' returns a list of aliases of a coding system.
-
-**** `coding-system-charset-list' returns a list of charsets supported
-by a coding system.
-
-**** `coding-system-priority-list' returns a list of coding systems
-ordered by their priorities.
-
-**** `set-coding-system-priority' sets priorities of coding systems.
-
-**** `coding-system-from-name' returns a coding system matching with
-the argument name.
-
-** There is a new input method, Robin, different from Quail.
-It has three functionalities:
- i) a simple input method (converts an ASCII sequence into a string).
-ii) converts an existing buffer substring into another string
-iii) reverse conversion (each character produced by a
-robin rule can hold the original ASCII sequence as a char-code-property)
-
-*** The new function `robin-define-package' defines a Robin package.
-
-*** The new function `robin-modify-package' modifies an existing Robin package.
-
-*** The new function `robin-use-package' starts using a Robin package
-as an input method.
-
-*** The new function `string-to-unibyte' is like `string-as-unibyte'
-but signals an error if STRING contains a non-ASCII, non-eight-bit
-character.
-
-** Changes related to the new font backend
-
-*** Which font backends to use can be specified by the X resource
-"FontBackend".  For instance, to use both X core fonts and Xft fonts:
-
-Emacs.FontBackend: x,xft
-
-If this resource is not set, Emacs tries to use all font backends
-available on your graphic device.
-
-*** New frame parameter `font-backend' specifies a list of
-font-backends supported by the frame's graphic device.  On X, they are
-currently `x' and `xft'.
-
-*** The function `set-fontset-font' now accepts a script name as the
-second argument, and has an optional 5th argument to control how to
-set the font.
-
-*** New functions:
-
-**** `fontp' checks if the argument is a font-spec or font-entity.
-
-**** `font-spec' creates a new font-spec object.
-
-**** `font-get' returns a font property value.
-
-**** `font-put' sets a font property value.
-
-**** `font-face-attributes' returns a plist of face attributes set by a font.
-
-**** `list-fonts' returns a list of font-entities matching a font spec.
-
-**** `find-font' returns the font-entity best matching the given font spec.
-
-**** `font-family-list' returns a list of family names of available fonts.
-
-**** `font-xlfd-name' returns an XLFD name of a given font spec, font
-entity, or font object.
-
-**** `clear-font-cache' clears all font caches.
-
-** Changes related to multiple-terminal (multi-tty) support
-
-*** $TERM is now set to `dumb' for subprocesses.  If you want to know the
-$TERM inherited by Emacs you will have to look inside initial-environment.
-
-*** $DISPLAY is now dynamically inherited from the frame's `display'.
-
-*** The `window-system' variable is now frame-local.  The new
-`initial-window-system' variable contains the `window-system' value
-for the first frame.  `window-system' is also now a function that
-takes a frame argument.
-
-*** The `keyboard-translate-table' variable and the terminal and
-keyboard coding systems are now terminal-local.
-
-*** You can specify a terminal device (`tty' parameter) and a terminal
-type (`tty-type' parameter) to `make-terminal-frame'.
-
-*** The function `make-frame-on-display' now works during a tty
-session.
-
-*** A new `terminal' data type.
-The functions `get-device-terminal', `terminal-parameters',
-`terminal-parameter', `set-terminal-parameter' use this data type.
-
-*** Function key sequences are now mapped using `local-function-key-map',
-a new variable.  This inherits from the global variable function-key-map,
-which is not used directly any more.
-
-*** New hooks:
-
-**** before-hack-local-variables-hook is called after setting new
-variable file-local-variables-alist, and before actually applying the
-file-local variables.
-
-**** `suspend-tty-functions' and `resume-tty-functions' are called
-after a tty frame has been suspended or resumed, respectively.  The
-functions are called with the terminal id of the frame being
-suspended/resumed as a parameter.
-
-**** The special hook `delete-terminal-functions' is called before
-deleting a terminal.
-
-*** New functions:
-
-**** `delete-terminal'
-
-**** `suspend-tty'
-
-**** `resume-tty'.
-
-*** `initial-environment' holds the environment inherited from Emacs's parent.
-
-** Redisplay changes
-
-*** For underlined characters, the distance between the underline and
-the baseline is controlled by a new variable, `underline-minimum-offset'.
-
-*** You can now pass the value of the `invisible' property to
-invisible-p to check whether it would cause the text to be invisible.
-This is convenient when checking invisibility of text with no buffer
-position (e.g. in before/after-strings).
-
-*** `clear-image-cache' can be told to flush only images of a specific file.
-
-*** `vertical-motion' can now be given a goal column.
-It now accepts a cons cell (COLS . LINES) in its first argument, which
-says to stop, where possible, at a pixel x-position equal to COLS
-times the default column width.
-
-*** redisplay-end-trigger-functions, set-window-redisplay-end-trigger,
-and window-redisplay-end-trigger are obsolete.  Use `jit-lock-register'
-instead.
-
-*** The new variables `wrap-prefix' and `line-prefix' specify display
-specs which are appended at display-time to every continuation line
-and non-continuation line, respectively.  In addition, Emacs
-recognizes the `wrap-prefix' and `line-prefix' text or overlay
-properties; these have the same effects as the variables of the same
-name, but take precedence.
-
-** The Lisp interpreter now treats non-breaking space as whitespace.
-
-** Miscellaneous new functions
-
-*** `apply-partially' performs a "curried" application of a function.
-
-*** `buffer-swap-text' swaps text between two buffers.  This can be
-useful for modes such as tar-mode, archive-mode, RMAIL.
-
-*** `combine-and-quote-strings' produces a single string from a list of strings
-sticking a separator string in between each pair, and quoting those
-strings that include the separator as their substring.  Useful for
-consing shell command lines from the individual arguments.
-
-*** `custom-note-var-changed' tells Custom to treat the change in a
-certain variable as having been made within Custom.
-
-*** `face-all-attributes' returns an alist describing all the basic
-attributes of a given face.
-
-*** `format-seconds' converts a number of seconds into a readable
-string of days, hours, etc.
-
-*** `image-refresh' refreshes all images associated with a given image
-specification.
-
-*** `locate-user-emacs-file' helps packages to select the appropriate
-place to save user-specific files.  It defaults to `user-emacs-directory'
-unless the file already exists at $HOME.
-
-*** `read-color' reads a color name using the minibuffer.
-
-*** `read-shell-command' does what its name says, with completion.  It
-uses the minibuffer-local-shell-command-map for that.
-
-*** `split-string-and-unquote' splits a string into a list of substrings
-on the boundaries of a given delimiter, and unquotes the substrings that
-are quoted.  Useful for taking apart shell commands.
-
-*** The two new functions `looking-at-p' and `string-match-p' can do
-the same matching as `looking-at' and `string-match' without changing
-the match data.
-
-*** The two new functions `make-serial-process' and
-`serial-process-configure' provide a Lisp interface to the new serial
-port support (see Emacs changes, above).
-
-** Miscellaneous new variables
-
-*** `auto-save-include-big-deletions', if non-nil, means auto-save is
-not turned off automatically after a big deletion.
-
-*** `read-circle', if nil, disables the reading of recursive Lisp
-structures using the #N= and #N# syntax.
-
-*** `this-command-keys-shift-translated' is non-nil if the key
-sequence invoking the current command was found by shift-translation.
-
-*** `window-point-insertion-type' determines the insertion-type of the
-marker used for window-point.
-
-*** bookmark provides `bookmark-make-record-function' so special major
-modes like Info can teach bookmark.el how to save and restore the
-relevant data.
-
-*** `fill-forward-paragraph-function' specifies which function the
-filling code should use to find paragraph boundaries.
-
-

-* New Packages for Lisp Programming in Emacs 23.1
-
-** The new package avl-tree.el deals with the AVL tree data structure.
-
-** The new package check-declare.el verifies the accuracy of
-declare-function macros (see Lisp Changes, above).
-
-** find-cmd.el can build `find' commands using lisp syntax.
-
-** The package misearch.el has been added.  It allows Isearch to search
-through multiple buffers.  A variable `multi-isearch-next-buffer-function'
-defines the function to call to get the next buffer to search in the series
-of multiple buffers.  Top-level functions `multi-isearch-buffers',
-`multi-isearch-buffers-regexp', `multi-isearch-files' and
-`multi-isearch-files-regexp' accept a single argument that specifies
-a list of buffers/files to search for a string/regexp.
-
-** The new major mode `special-mode' is intended as a parent for
-major modes such as those that set the "'mode-class 'special" property.
-
-

-----------------------------------------------------------------------
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-

-Local variables:
-mode: outline
-paragraph-separate: "[ 	
]*$"
-end:
-
-arch-tag: e759449d-88b3-4de4-9900-3a6c3dfa23e2

=== removed directory '.pc/0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch'
=== removed directory '.pc/0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch/lib-src'
=== removed file '.pc/0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch/lib-src/movemail.c'
--- .pc/0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch/lib-src/movemail.c	2011-04-10 10:33:31 +0000
+++ .pc/0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch/lib-src/movemail.c	1970-01-01 00:00:00 +0000
@@ -1,964 +0,0 @@
-/* movemail foo bar -- move file foo to file bar,
-   locking file foo the way /bin/mail respects.
-   Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
-   cause loss of mail* if you do it on a system that does not normally
-   use flock as its way of interlocking access to inbox files.  The
-   setting of MAIL_USE_FLOCK and MAIL_USE_LOCKF *must agree* with the
-   system's own conventions.  It is not a choice that is up to you.
-
-   So, if your system uses lock files rather than flock, then the only way
-   you can get proper operation is to enable movemail to write lockfiles there.
-   This means you must either give that directory access modes
-   that permit everyone to write lockfiles in it, or you must make movemail
-   a setuid or setgid program.  */
-
-/*
- * Modified January, 1986 by Michael R. Gretzinger (Project Athena)
- *
- * Added POP (Post Office Protocol) service.  When compiled -DMAIL_USE_POP
- * movemail will accept input filename arguments of the form
- * "po:username".  This will cause movemail to open a connection to
- * a pop server running on $MAILHOST (environment variable).  Movemail
- * must be setuid to root in order to work with POP.
- *
- * New module: popmail.c
- * Modified routines:
- *	main - added code within #ifdef MAIL_USE_POP; added setuid (getuid ())
- *		after POP code.
- * New routines in movemail.c:
- *	get_errmsg - return pointer to system error message
- *
- * Modified August, 1993 by Jonathan Kamens (OpenVision Technologies)
- *
- * Move all of the POP code into a separate file, "pop.c".
- * Use strerror instead of get_errmsg.
- *
- */
-
-#include <config.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
-
-#include <getopt.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include "syswait.h"
-#ifdef MAIL_USE_POP
-#include "pop.h"
-#endif
-
-#ifdef MSDOS
-#undef access
-#endif /* MSDOS */
-
-#ifndef DIRECTORY_SEP
-#define DIRECTORY_SEP '/'
-#endif
-#ifndef IS_DIRECTORY_SEP
-#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
-#endif
-
-#ifdef WINDOWSNT