*** empty log message ***

4 files changed, 812 insertions, 57 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d8679d6897..b18b3dba4b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,18 @@
+2000-01-31  Inge Frick  <inge@nada.kth.se>
+
+        * view.el: Some changes in documentation.  Removed some trailing
+        whitespace. Changed some parameter names to agree with
+        documentation.
+        (view-mode-exit): Keep entry in `view-return-to-alist' only when a
+        window is not deleted.  Modifies change 1998-04-26.
+        
 2000-01-31  Gerd Moellmann  <gerd@gnu.org>
 
         * windmove.el: New file.
 
         * progmodes/ebnf2ps.el, progmodes/ebnf-bnf.el,
         progmodes/ebnf-iso.el, progmodes/ebnf-otz.el,
-        progmodes/ebnf-yac.el: Update copyright.
+        progmodes/ebnf-yac.el: Update copyright and license info.
         
         * jit-lock.el (jit-lock-function): Widen before calculating end
         position.
diff --git a/lisp/loaddefs.el b/lisp/loaddefs.el
index 360aa326336..b72edd58720 100644
--- a/lisp/loaddefs.el
+++ b/lisp/loaddefs.el
@@ -381,7 +381,7 @@ Remove any highlighting that was added by `align-highlight-rule'." t nil)
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "ange-ftp.el" (14460 38616))
+;;;;;;  "ange-ftp.el" (14481 51915))
 ;;; Generated autoloads from ange-ftp.el
  (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
 
@@ -1280,7 +1280,7 @@ corresponding bookmark function from Lisp (the one without the
 ;;;;;;  browse-url-of-buffer browse-url-of-file browse-url-generic-program
 ;;;;;;  browse-url-save-file browse-url-netscape-display browse-url-new-window-p
 ;;;;;;  browse-url-browser-function) "browse-url" "browse-url.el"
-;;;;;;  (14454 73))
+;;;;;;  (14477 53252))
 ;;; Generated autoloads from browse-url.el
 
 (defvar browse-url-browser-function (if (eq system-type (quote windows-nt)) (quote browse-url-default-windows-browser) (quote browse-url-netscape)) "\
@@ -2308,7 +2308,7 @@ The return value is a vector of resulting CCL registers." nil nil)
 ;;;;;;  checkdoc-continue checkdoc-start checkdoc-current-buffer
 ;;;;;;  checkdoc-eval-current-buffer checkdoc-message-interactive
 ;;;;;;  checkdoc-interactive checkdoc) "checkdoc" "emacs-lisp/checkdoc.el"
-;;;;;;  (14456 31049))
+;;;;;;  (14482 54417))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 
 (autoload (quote checkdoc) "checkdoc" "\
@@ -2505,7 +2505,7 @@ and runs the normal hook `command-history-hook'." t nil)
 
 ;;;***
 
-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (14432 37868))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (14482 54434))
 ;;; Generated autoloads from emacs-lisp/cl.el
 
 (defvar custom-print-functions nil "\
@@ -3062,7 +3062,7 @@ Randomly permute the elements of VECTOR (all permutations equally likely)" nil n
 ;;;***
 
 ;;;### (autoloads (copyright copyright-update) "copyright" "emacs-lisp/copyright.el"
-;;;;;;  (14454 138))
+;;;;;;  (14463 42213))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 
 (autoload (quote copyright-update) "copyright" "\
@@ -4692,6 +4692,120 @@ to implement dynamic menus." nil nil)
 
 ;;;***
 
+;;;### (autoloads (ebnf-pop-style ebnf-push-style ebnf-reset-style
+;;;;;;  ebnf-apply-style ebnf-merge-style ebnf-insert-style ebnf-setup
+;;;;;;  ebnf-syntax-region ebnf-syntax-buffer ebnf-eps-region ebnf-eps-buffer
+;;;;;;  ebnf-spool-region ebnf-spool-buffer ebnf-print-region ebnf-print-buffer
+;;;;;;  ebnf-customize) "ebnf2ps" "progmodes/ebnf2ps.el" (14485 59667))
+;;; Generated autoloads from progmodes/ebnf2ps.el
+
+(autoload (quote ebnf-customize) "ebnf2ps" "\
+Customization for ebnf group." t nil)
+
+(autoload (quote ebnf-print-buffer) "ebnf2ps" "\
+Generate and print a PostScript syntatic chart image of the buffer.
+
+When called with a numeric prefix argument (C-u), prompts the user for
+the name of a file to save the PostScript image in, instead of sending
+it to the printer.
+
+More specifically, the FILENAME argument is treated as follows: if it
+is nil, send the image to the printer.  If FILENAME is a string, save
+the PostScript image in a file with that name.  If FILENAME is a
+number, prompt the user for the name of the file to save in." t nil)
+
+(autoload (quote ebnf-print-region) "ebnf2ps" "\
+Generate and print a PostScript syntatic chart image of the region.
+Like `ebnf-print-buffer', but prints just the current region." t nil)
+
+(autoload (quote ebnf-spool-buffer) "ebnf2ps" "\
+Generate and spool a PostScript syntatic chart image of the buffer.
+Like `ebnf-print-buffer' except that the PostScript image is saved in a
+local buffer to be sent to the printer later.
+
+Use the command `ebnf-despool' to send the spooled images to the printer." t nil)
+
+(autoload (quote ebnf-spool-region) "ebnf2ps" "\
+Generate a PostScript syntatic chart image of the region and spool locally.
+Like `ebnf-spool-buffer', but spools just the current region.
+
+Use the command `ebnf-despool' to send the spooled images to the printer." t nil)
+
+(autoload (quote ebnf-eps-buffer) "ebnf2ps" "\
+Generate a PostScript syntatic chart image of the buffer in a EPS file.
+
+Indeed, for each production is generated a EPS file.
+The EPS file name has the following form:
+
+   <PREFIX><PRODUCTION>.eps
+
+<PREFIX>     is given by variable `ebnf-eps-prefix'.
+             The default value is \"ebnf--\".
+
+<PRODUCTION> is the production name.
+             The production name is mapped to form a valid file name.
+             For example, the production name \"A/B + C\" is mapped to
+             \"A_B_+_C\" and the EPS file name used is \"ebnf--A_B_+_C.eps\".
+
+WARNING: It's *NOT* asked any confirmation to override an existing file." t nil)
+
+(autoload (quote ebnf-eps-region) "ebnf2ps" "\
+Generate a PostScript syntatic chart image of the region in a EPS file.
+
+Indeed, for each production is generated a EPS file.
+The EPS file name has the following form:
+
+   <PREFIX><PRODUCTION>.eps
+
+<PREFIX>     is given by variable `ebnf-eps-prefix'.
+             The default value is \"ebnf--\".
+
+<PRODUCTION> is the production name.
+             The production name is mapped to form a valid file name.
+             For example, the production name \"A/B + C\" is mapped to
+             \"A_B_+_C\" and the EPS file name used is \"ebnf--A_B_+_C.eps\".
+
+WARNING: It's *NOT* asked any confirmation to override an existing file." t nil)
+
+(defalias (quote ebnf-despool) (quote ps-despool))
+
+(autoload (quote ebnf-syntax-buffer) "ebnf2ps" "\
+Does a syntatic analysis of the current buffer." t nil)
+
+(autoload (quote ebnf-syntax-region) "ebnf2ps" "\
+Does a syntatic analysis of a region." t nil)
+
+(autoload (quote ebnf-setup) "ebnf2ps" "\
+Return the current ebnf2ps setup." nil nil)
+
+(autoload (quote ebnf-insert-style) "ebnf2ps" "\
+Insert a new style NAME with inheritance INHERITS and values VALUES." t nil)
+
+(autoload (quote ebnf-merge-style) "ebnf2ps" "\
+Merge values of style NAME with style VALUES." t nil)
+
+(autoload (quote ebnf-apply-style) "ebnf2ps" "\
+Set STYLE to current style.
+
+It returns the old style symbol." t nil)
+
+(autoload (quote ebnf-reset-style) "ebnf2ps" "\
+Reset current style.
+
+It returns the old style symbol." t nil)
+
+(autoload (quote ebnf-push-style) "ebnf2ps" "\
+Push the current style and set STYLE to current style.
+
+It returns the old style symbol." t nil)
+
+(autoload (quote ebnf-pop-style) "ebnf2ps" "\
+Pop a style and set it to current style.
+
+It returns the old style symbol." t nil)
+
+;;;***
+
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
 ;;;;;;  (13778 5499))
 ;;; Generated autoloads from ebuff-menu.el
@@ -4726,7 +4840,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing." t nil)
 ;;;***
 
 ;;;### (autoloads (edebug-eval-top-level-form def-edebug-spec edebug-all-forms
-;;;;;;  edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (14460 38617))
+;;;;;;  edebug-all-defs) "edebug" "emacs-lisp/edebug.el" (14482 54435))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -5867,7 +5981,7 @@ with no args, if that value is non-nil." t nil)
 ;;;;;;  facemenu-remove-special facemenu-remove-all facemenu-remove-face-props
 ;;;;;;  facemenu-set-read-only facemenu-set-intangible facemenu-set-invisible
 ;;;;;;  facemenu-set-face-from-menu facemenu-set-background facemenu-set-foreground
-;;;;;;  facemenu-set-face) "facemenu" "facemenu.el" (14412 8701))
+;;;;;;  facemenu-set-face) "facemenu" "facemenu.el" (14482 54416))
 ;;; Generated autoloads from facemenu.el
  (define-key global-map "\M-g" 'facemenu-keymap)
  (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
@@ -5887,17 +6001,17 @@ Menu keymap for background colors")
 
 (defalias (quote facemenu-background-menu) facemenu-background-menu)
 
-(defvar facemenu-special-menu (let ((map (make-sparse-keymap "Special"))) (define-key map [115] (cons "Remove Special" (quote facemenu-remove-special))) (define-key map [116] (cons "Intangible" (quote facemenu-set-intangible))) (define-key map [118] (cons "Invisible" (quote facemenu-set-invisible))) (define-key map [114] (cons "Read-Only" (quote facemenu-set-read-only))) map) "\
+(defvar facemenu-special-menu (let ((map (make-sparse-keymap "Special"))) (define-key map [115] (cons (purecopy "Remove Special") (quote facemenu-remove-special))) (define-key map [116] (cons (purecopy "Intangible") (quote facemenu-set-intangible))) (define-key map [118] (cons (purecopy "Invisible") (quote facemenu-set-invisible))) (define-key map [114] (cons (purecopy "Read-Only") (quote facemenu-set-read-only))) map) "\
 Menu keymap for non-face text-properties.")
 
 (defalias (quote facemenu-special-menu) facemenu-special-menu)
 
-(defvar facemenu-justification-menu (let ((map (make-sparse-keymap "Justification"))) (define-key map [99] (cons "Center" (quote set-justification-center))) (define-key map [98] (cons "Full" (quote set-justification-full))) (define-key map [114] (cons "Right" (quote set-justification-right))) (define-key map [108] (cons "Left" (quote set-justification-left))) (define-key map [117] (cons "Unfilled" (quote set-justification-none))) map) "\
+(defvar facemenu-justification-menu (let ((map (make-sparse-keymap "Justification"))) (define-key map [99] (cons (purecopy "Center") (quote set-justification-center))) (define-key map [98] (cons (purecopy "Full") (quote set-justification-full))) (define-key map [114] (cons (purecopy "Right") (quote set-justification-right))) (define-key map [108] (cons (purecopy "Left") (quote set-justification-left))) (define-key map [117] (cons (purecopy "Unfilled") (quote set-justification-none))) map) "\
 Submenu for text justification commands.")
 
 (defalias (quote facemenu-justification-menu) facemenu-justification-menu)
 
-(defvar facemenu-indentation-menu (let ((map (make-sparse-keymap "Indentation"))) (define-key map [decrease-right-margin] (cons "Indent Right Less" (quote decrease-right-margin))) (define-key map [increase-right-margin] (cons "Indent Right More" (quote increase-right-margin))) (define-key map [decrease-left-margin] (cons "Indent Less" (quote decrease-left-margin))) (define-key map [increase-left-margin] (cons "Indent More" (quote increase-left-margin))) map) "\
+(defvar facemenu-indentation-menu (let ((map (make-sparse-keymap "Indentation"))) (define-key map [decrease-right-margin] (cons (purecopy "Indent Right Less") (quote decrease-right-margin))) (define-key map [increase-right-margin] (cons (purecopy "Indent Right More") (quote increase-right-margin))) (define-key map [decrease-left-margin] (cons (purecopy "Indent Less") (quote decrease-left-margin))) (define-key map [increase-left-margin] (cons (purecopy "Indent More") (quote increase-left-margin))) map) "\
 Submenu for indentation commands.")
 
 (defalias (quote facemenu-indentation-menu) facemenu-indentation-menu)
@@ -5907,9 +6021,9 @@ Facemenu top-level menu keymap.")
 
 (setq facemenu-menu (make-sparse-keymap "Text Properties"))
 
-(let ((map facemenu-menu)) (define-key map [dc] (cons "Display Colors" (quote list-colors-display))) (define-key map [df] (cons "Display Faces" (quote list-faces-display))) (define-key map [dp] (cons "List Properties" (quote list-text-properties-at))) (define-key map [ra] (cons "Remove Text Properties" (quote facemenu-remove-all))) (define-key map [rm] (cons "Remove Face Properties" (quote facemenu-remove-face-props))) (define-key map [s1] (list "-----------------")))
+(let ((map facemenu-menu)) (define-key map [dc] (cons (purecopy "Display Colors") (quote list-colors-display))) (define-key map [df] (cons (purecopy "Display Faces") (quote list-faces-display))) (define-key map [dp] (cons (purecopy "List Properties") (quote list-text-properties-at))) (define-key map [ra] (cons (purecopy "Remove Text Properties") (quote facemenu-remove-all))) (define-key map [rm] (cons (purecopy "Remove Face Properties") (quote facemenu-remove-face-props))) (define-key map [s1] (list (purecopy "--"))))
 
-(let ((map facemenu-menu)) (define-key map [in] (cons "Indentation" (quote facemenu-indentation-menu))) (define-key map [ju] (cons "Justification" (quote facemenu-justification-menu))) (define-key map [s2] (list "-----------------")) (define-key map [sp] (cons "Special Properties" (quote facemenu-special-menu))) (define-key map [bg] (cons "Background Color" (quote facemenu-background-menu))) (define-key map [fg] (cons "Foreground Color" (quote facemenu-foreground-menu))) (define-key map [fc] (cons "Face" (quote facemenu-face-menu))))
+(let ((map facemenu-menu)) (define-key map [in] (cons (purecopy "Indentation") (quote facemenu-indentation-menu))) (define-key map [ju] (cons (purecopy "Justification") (quote facemenu-justification-menu))) (define-key map [s2] (list (purecopy "--"))) (define-key map [sp] (cons (purecopy "Special Properties") (quote facemenu-special-menu))) (define-key map [bg] (cons (purecopy "Background Color") (quote facemenu-background-menu))) (define-key map [fg] (cons (purecopy "Foreground Color") (quote facemenu-foreground-menu))) (define-key map [fc] (cons (purecopy "Face") (quote facemenu-face-menu))))
 
 (defalias (quote facemenu-menu) facemenu-menu)
 
@@ -5997,7 +6111,7 @@ of colors that the current display can handle." t nil)
 ;;;***
 
 ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock"
-;;;;;;  "fast-lock.el" (14263 35417))
+;;;;;;  "fast-lock.el" (14477 53252))
 ;;; Generated autoloads from fast-lock.el
 
 (autoload (quote fast-lock-mode) "fast-lock" "\
@@ -6461,7 +6575,7 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
 ;;;### (autoloads (font-lock-fontify-buffer global-font-lock-mode
 ;;;;;;  global-font-lock-mode font-lock-remove-keywords font-lock-add-keywords
 ;;;;;;  turn-on-font-lock font-lock-mode) "font-lock" "font-lock.el"
-;;;;;;  (14424 65029))
+;;;;;;  (14477 53252))
 ;;; Generated autoloads from font-lock.el
 
 (defvar font-lock-mode-hook nil "\
@@ -6652,7 +6766,7 @@ Visit a file in Forms mode in other window." t nil)
 ;;;***
 
 ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran"
-;;;;;;  "progmodes/fortran.el" (14454 142))
+;;;;;;  "progmodes/fortran.el" (14477 53257))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (defvar fortran-tab-mode-default nil "\
@@ -6778,6 +6892,17 @@ Some generic modes are defined in `generic-x.el'." t nil)
 
 ;;;***
 
+;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
+;;;;;;  (14480 59906))
+;;; Generated autoloads from progmodes/glasses.el
+
+(autoload (quote glasses-mode) "glasses" "\
+Minor mode for making identifiers likeThis readable.
+When this mode is active, it tries to add virtual separators (like underscores)
+at places they belong to." t nil)
+
+;;;***
+
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
 ;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (14030 49411))
 ;;; Generated autoloads from gnus/gnus.el
@@ -8001,7 +8126,7 @@ of `inferior-lisp-program').  Runs the hooks from
 
 ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
 ;;;;;;  Info-goto-emacs-command-node info-standalone info info-other-window)
-;;;;;;  "info" "info.el" (14412 8715))
+;;;;;;  "info" "info.el" (14485 39769))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -8470,7 +8595,7 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;### (autoloads (iswitchb-buffer-other-frame iswitchb-display-buffer
 ;;;;;;  iswitchb-buffer-other-window iswitchb-buffer iswitchb-default-keybindings
-;;;;;;  iswitchb-read-buffer) "iswitchb" "iswitchb.el" (14384 5061))
+;;;;;;  iswitchb-read-buffer) "iswitchb" "iswitchb.el" (14482 55434))
 ;;; Generated autoloads from iswitchb.el
 
 (autoload (quote iswitchb-read-buffer) "iswitchb" "\
@@ -8575,7 +8700,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading." nil
 ;;;***
 
 ;;;### (autoloads (turn-on-jit-lock jit-lock-mode) "jit-lock" "jit-lock.el"
-;;;;;;  (14275 59802))
+;;;;;;  (14485 51270))
 ;;; Generated autoloads from jit-lock.el
 
 (autoload (quote jit-lock-mode) "jit-lock" "\
@@ -8755,7 +8880,7 @@ The return value is number of composed characters." nil nil)
 ;;;***
 
 ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock"
-;;;;;;  "lazy-lock.el" (14263 35461))
+;;;;;;  "lazy-lock.el" (14477 53252))
 ;;; Generated autoloads from lazy-lock.el
 
 (autoload (quote lazy-lock-mode) "lazy-lock" "\
@@ -9123,8 +9248,8 @@ This function normally would be called when the message is sent." nil nil)
 
 ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region
 ;;;;;;  mail-unquote-printable mail-quote-printable mail-file-babyl-p
-;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (14263
-;;;;;;  33297))
+;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (14480
+;;;;;;  16128))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -10526,34 +10651,6 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'." t nil)
 
 ;;;***
 
-;;;### (autoloads (ph-query-form ph-expand-inline ph-get-phone ph-get-email)
-;;;;;;  "ph" "ph.el" (13623 48480))
-;;; Generated autoloads from ph.el
-
-(autoload (quote ph-get-email) "ph" "\
-Get the email field of NAME from the PH/QI directory server." t nil)
-
-(autoload (quote ph-get-phone) "ph" "\
-Get the phone field of NAME from the PH/QI directory server." t nil)
-
-(autoload (quote ph-expand-inline) "ph" "\
-Query the PH server, and expand the query string before point.
-The query string consists of the buffer substring from the point back to
-the preceding comma, colon or beginning of line.  If it contains more than
-one word, the variable `ph-inline-query-format-list' controls to map these
-onto CCSO database field names.
-After querying the server for the given string, the expansion specified by 
-`ph-inline-expansion-format' is inserted in the buffer at point.
-If REPLACE is t, then this expansion replaces the name in the buffer.
-If `ph-expanding-overwrites-query' is t, that inverts the meaning of REPLACE." t nil)
-
-(autoload (quote ph-query-form) "ph" "\
-Display a form to query the CCSO PH/QI nameserver.
-If given a non-nil argument the function first queries the server 
-for the existing fields and displays a corresponding form." t nil)
-
-;;;***
-
 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
 ;;;;;;  (14348 33291))
 ;;; Generated autoloads from textmodes/picture.el
@@ -12809,7 +12906,7 @@ Pick your favourite shortcuts:
 
 ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields
 ;;;;;;  sort-fields sort-numeric-fields sort-pages sort-paragraphs
-;;;;;;  sort-lines sort-subr) "sort" "sort.el" (13304 43541))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (14481 36636))
 ;;; Generated autoloads from sort.el
 
 (autoload (quote sort-subr) "sort" "\
@@ -12873,7 +12970,9 @@ the sort order." t nil)
 (autoload (quote sort-numeric-fields) "sort" "\
 Sort lines in region numerically by the ARGth field of each line.
 Fields are separated by whitespace and numbered from 1 up.
-Specified field must contain a number in each line of the region.
+Specified field must contain a number in each line of the region,
+which may begin with \"0x\" or \"0\" for hexadecimal and octal values.
+Otherwise, the number is interpreted according to sort-numeric-base.
 With a negative arg, sorts by the ARGth field counted from the right.
 Called from a program, there are three arguments:
 FIELD, BEG and END.  BEG and END specify region to sort." t nil)
@@ -13798,7 +13897,7 @@ Info `g*' command is inadequate." t nil)
 ;;;### (autoloads (thai-composition-function thai-post-read-conversion
 ;;;;;;  thai-compose-buffer thai-compose-string thai-compose-region
 ;;;;;;  setup-thai-environment) "thai-util" "language/thai-util.el"
-;;;;;;  (14423 51008))
+;;;;;;  (14477 53255))
 ;;; Generated autoloads from language/thai-util.el
 
 (autoload (quote setup-thai-environment) "thai-util" "\
@@ -14062,7 +14161,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." nil
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (14459 43081))
+;;;;;;  "tmm.el" (14467 13719))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -14388,7 +14487,7 @@ which specify the range to operate on." t nil)
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "mail/undigest.el" (13475 35727))
+;;;;;;  "undigest" "mail/undigest.el" (14473 58848))
 ;;; Generated autoloads from mail/undigest.el
 
 (autoload (quote undigestify-rmail-message) "undigest" "\
@@ -14448,8 +14547,8 @@ The buffer in question is current when this function is called." nil nil)
 ;;;;;;  vc-create-snapshot vc-directory vc-resolve-conflicts vc-merge
 ;;;;;;  vc-insert-headers vc-version-other-window vc-diff vc-register
 ;;;;;;  vc-next-action edit-vc-file with-vc-file vc-annotate-mode-hook
-;;;;;;  vc-before-checkin-hook vc-checkin-hook) "vc" "vc.el" (14460
-;;;;;;  19361))
+;;;;;;  vc-before-checkin-hook vc-checkin-hook) "vc" "vc.el" (14478
+;;;;;;  52465))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkin-hook nil "\
@@ -15327,6 +15426,48 @@ Delete WIDGET." nil nil)
 
 ;;;***
 
+;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (14485
+;;;;;;  64019))
+;;; Generated autoloads from windmove.el
+
+(autoload (quote windmove-left) "windmove" "\
+Select the window to the left of the current one.
+With no prefix argument, or with prefix argument equal to zero,
+\"left\" is relative to the position of point in the window; otherwise
+it is relative to the top edge (for positive ARG) or the bottom edge
+\(for negative ARG) of the current window.
+If no window is at the desired location, an error is signaled." t nil)
+
+(autoload (quote windmove-up) "windmove" "\
+Select the window above the current one.
+With no prefix argument, or with prefix argument equal to zero, \"up\"
+is relative to the position of point in the window; otherwise it is
+relative to the left edge (for positive ARG) or the right edge (for
+negative ARG) of the current window.
+If no window is at the desired location, an error is signaled." t nil)
+
+(autoload (quote windmove-right) "windmove" "\
+Select the window to the right of the current one.
+With no prefix argument, or with prefix argument equal to zero,
+\"right\" is relative to the position of point in the window;
+otherwise it is relative to the top edge (for positive ARG) or the
+bottom edge (for negative ARG) of the current window.
+If no window is at the desired location, an error is signaled." t nil)
+
+(autoload (quote windmove-down) "windmove" "\
+Select the window below the current one.
+With no prefix argument, or with prefix argument equal to zero,
+\"down\" is relative to the position of point in the window; otherwise
+it is relative to the left edge (for positive ARG) or the right edge
+\(for negative ARG) of the current window.
+If no window is at the desired location, an error is signaled." t nil)
+
+(autoload (quote windmove-default-keybindings) "windmove" "\
+Set up default keybindings for `windmove'." t nil)
+
+;;;***
+
 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
 ;;;;;;  (13415 51576))
 ;;; Generated autoloads from emulation/ws-mode.el
diff --git a/lisp/windmove.el b/lisp/windmove.el
new file mode 100644
index 00000000000..7d5d629d2cb
--- /dev/null
+++ b/lisp/windmove.el
@@ -0,0 +1,604 @@
+;; windmove.el -- directional window-selection routines.
+;;
+;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;;
+;; Author: Hovav Shacham (hovav@cs.stanford.edu)
+;; Created: 17 October 1998
+;; Keywords: window, movement
+;;
+;; 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 2, 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; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+;;
+;; --------------------------------------------------------------------
+
+;;; Commentary:
+;;
+;; This package defines a set of routines, windmove-{left,up,right,
+;; down}, for selection of windows in a frame geometrically.  For
+;; example, `windmove-right' selects the window immediately to the
+;; right of the currently-selected one.  This functionality is similar
+;; to the window-selection controls of the BRIEF editor of yore.
+;;
+;; One subtle point is what happens when the window to the right has
+;; been split vertically; for example, consider a call to
+;; `windmove-right' in this setup:
+;;
+;;                    -------------
+;;                    |      | A  |
+;;                    |      |    |
+;;                    |      |-----
+;;                    | *    |    |    (* is point in the currently
+;;                    |      | B  |     selected window)
+;;                    |      |    |
+;;                    -------------
+;;
+;; There are (at least) three reasonable things to do:
+;; (1) Always move to the window to the right of the top edge of the
+;;     selected window; in this case, this policy selects A.
+;; (2) Always move to the window to the right of the bottom edge of
+;;     the selected window; in this case, this policy selects B.
+;; (3) Move to the window to the right of point in the slected
+;;     window.  This may select either A or B, depending on the
+;;     position of point; in the illustrated example, it would select
+;;     B.
+;;
+;; Similar issues arise for all the movement functions.  Windmove
+;; resolves this problem by allowing the user to specify behavior
+;; through a prefix argument.  The cases are thus:
+;; * if no argument is given to the movement functions, or the
+;;   argument given is zero, movement is relative to point;
+;; * if a positive argument is given, movement is relative to the top
+;;   or left edge of the selected window, depending on whether the
+;;   movement is to be horizontal or vertical;
+;; * if a negative argument is given, movement is relative to the
+;;   bottom or right edge of the selected window, depending on whether
+;;   the movement is to be horizontal or vertical.
+;;
+;;
+;; Another feature enables wrap-around mode when the variable
+;; `windmove-wrap-around' is set to a non-nil value.  In this mode,
+;; movement that falls off the edge of the frame will wrap around to
+;; find the window on the opposite side of the frame.  Windmove does
+;; the Right Thing about the minibuffer; for example, consider:
+;;
+;;                    -------------
+;;                    |    *      |
+;;                    |-----------|
+;;                    |     A     |
+;;                    |-----------|    (* is point in the currently
+;;                    |  B   | C  |     selected window)
+;;                    |      |    |
+;;                    -------------
+;;
+;; With wraparound enabled, windmove-down will move to A, while
+;; windmove-up will move to the minibuffer if it is active, or to
+;; either B or C depending on the prefix argument.
+;;
+;;
+;; A set of default keybindings is supplied: shift-{left,up,right,down}
+;; invoke the corresponding Windmove function.  See the installation
+;; section if you wish to use these keybindings.
+
+
+;; Installation:
+;;
+;; Put the following line in your `.emacs' file:
+;;
+;;     (windmove-default-keybindings)    ; default keybindings
+;;
+;;
+;; If you wish to enable wrap-around, also add a line like:
+;;
+;;    (setq windmove-wrap-around t)
+;;
+;;
+;; Note: If you have an Emacs that manifests a bug that sometimes
+;; causes the occasional creation of a "lost column" between windows,
+;; so that two adjacent windows do not actually touch, you may want to
+;; increase the value of `windmove-window-distance-delta' to 2 or 3:
+;;     
+;;     (setq windmove-window-distance-delta 2)
+;;
+
+;; Acknowledgements:
+;;
+;; Special thanks to Julian Assange (proff@iq.org), whose
+;; change-windows-intuitively.el predates Windmove, and provided the
+;; inspiration for it.  Kin Cho (kin@symmetrycomm.com) was the first
+;; to suggest wrap-around behavior.  Thanks also to Gerd Moellmann
+;; (gerd@gnu.org) for his comments and suggestions.
+
+;; --------------------------------------------------------------------
+
+;;; Code:
+
+
+;; User configurable variables:
+
+;; For customize ...
+(defgroup windmove nil
+  "Directional selection of windows in a frame."
+  :prefix "windmove-"
+  :group 'windows
+  :group 'convenience)
+
+
+(defcustom windmove-wrap-around nil
+  "Whether movement off the edge of the frame wraps around.
+If this variable is set to t, moving left from the leftmost window in
+a frame will find the rightmost one, and similarly for the other
+directions.  The minibuffer is skipped over in up/down movements if it
+is inactive."
+  :type 'boolean
+  :group 'windmove)
+
+;; If your Emacs sometimes places an empty column between two adjacent
+;; windows, you may wish to set this delta to 2.
+(defcustom windmove-window-distance-delta 1
+  "How far away from the current window to look for an adjacent window.
+Measured in characters either horizontally or vertically; setting this
+to a value larger than 1 may be useful in getting around window-
+placement bugs in old versions of Emacs."
+  :type 'number
+  :group 'windmove)
+
+
+
+;; Implementation overview:
+;;
+;; The conceptual framework behind this code is all fairly simple.  We
+;; are on one window; we wish to move to another.  The correct window
+;; to move to is determined by the position of point in the current
+;; window as well as the overall window setup.
+;;
+;; Early on, I made the decision to base my implementation around the
+;; built-in function `window-at'.  This function takes a frame-based
+;; coordinate, and returns the window that contains it.  Using this
+;; function, the job of the various top-level windmove functions can
+;; be decomposed: first, find the current frame-based location of
+;; point; second, manipulate it in some way to give a new location,
+;; that hopefully falls in the window immediately at left (or right,
+;; etc.); third, use `window-at' and `select-window' to select the
+;; window at that new location.
+;;
+;; This is probably not the only possible architecture, and it turns
+;; out to have some inherent cruftiness.  (Well, okay, the third step
+;; is pretty clean....)  We will consider each step in turn.
+;;
+;; A quick digression about coordinate frames: most of the functions
+;; in the windmove package deal with screen coordinates in one way or
+;; another.  These coordinates are always relative to some reference
+;; points.  Window-based coordinates have their reference point in the
+;; upper-left-hand corner of whatever window is being talked about;
+;; frame-based coordinates have their reference point in the
+;; upper-left-hand corner of the entire frame (of which the current
+;; window is a component).
+;;
+;; All coordinates are zero-based, which simply means that the
+;; reference point (whatever it is) is assigned the value (x=0, y=0).
+;; X-coordinates grow down the screen, and Y-coordinates grow towards
+;; the right of the screen.
+;;
+;; Okay, back to work.  The first step is to gather information about
+;; the frame-based coordinates of point, or rather, the reference
+;; location.  The reference location can be point, or the upper-left,
+;; or the lower-right corner of the window; the particular one used is
+;; controlled by the prefix argument to `windmove-left' and all the
+;; rest.
+;;
+;; This work is done by `windmove-reference-loc'.  It can figure out
+;; the locations of the corners by calling `window-edges', but to
+;; calculate the frame-based location of point, it calls the workhorse
+;; function `windmove-coordinates-of-position', which itself calls the
+;; incredibly hairy builtin `compute-motion'.  There is a good deal of
+;; black magic in getting all the arguments to this function just right.
+;;
+;; The second step is more messy.  Conceptually, it is fairly simple:
+;; if we know the reference location, and the coordinates of the
+;; current window, we can "throw" our reference point just over the
+;; appropriate edge of the window, and see what other window is
+;; there.  More explicitly, consider this example from the user
+;; documentation above.
+;;
+;;                    -------------
+;;                    |      | A  |
+;;                    |      |    |
+;;                    |      |-----
+;;                    | *    |    |    (* is point in the currently
+;;                    |      | B  |     selected window)
+;;                    |      |    |
+;;                    -------------
+;;
+;; The asterisk marks the reference point; we wish to move right.
+;; Since we are moving horizontally, the Y coordinate of the new
+;; location will be the same.  The X coordinate can be such that it is
+;; just past the edge of the present window.  Obviously, the new point
+;; will be inside window B.  This in itself is fairly simple: using
+;; the result of `windmove-reference-loc' and `window-edges', all the
+;; necessary math can be performed.  (Having said that, there is a
+;; good deal of room for off-by-one errors, and Emacs 19.34, at least,
+;; sometimes manifests a bug where two windows don't actually touch,
+;; so a larger skip is required.)  The actual math here is done by
+;; `windmove-other-window-loc'.
+;;
+;; But we can't just pass the result of `windmove-other-window-loc' to
+;; `window-at' directly.  Why not?  Suppose a move would take us off
+;; the edge of the screen, say to the left.  We want to give a
+;; descriptive error message to the user.  Or, suppose that a move
+;; would place us in the minibuffer.  What if the minibuffer is
+;; inactive?
+;;
+;; Actually, the whole subject of the minibuffer edge of the frame is
+;; rather messy.  It turns out that with a sufficiently large delta,
+;; we can fly off the bottom edge of the frame and miss the minibuffer
+;; altogther.  This, I think, is never right: if there's a minibuffer
+;; and you're not in it, and you move down, the minibuffer should be
+;; in your way.
+;;
+;; (By the way, I'm not totally sure that the code does the right
+;; thing in really weird cases, like a frame with no minibuffer.)
+;;
+;; So, what we need is some ways to do constraining and such.  The
+;; early versions of windmove took a fairly simplistic approach to all
+;; this.  When I added the wrap-around option, those internals had to
+;; be rewritten.  After a *lot* of futzing around, I came up with a
+;; two-step process that I think is general enough to cover the
+;; relevant cases.  (I'm not totally happy with having to pass the
+;; window variable as deep as I do, but we can't have everything.)
+;;
+;; In the first phase, we make sure that the new location is sane.
+;; "Sane" means that we can only fall of the edge of the frame in the
+;; direction we're moving in, and that we don't miss the minibuffer if
+;; we're moving down and not already in the minibuffer.  The function 
+;; `windmove-constrain-loc-for-movement' takes care of all this.
+;;
+;; Then, we handle the wraparound, if it's enabled.  The function
+;; `windmove-wrap-loc-for-movement' takes coordinate values (both X
+;; and Y) that fall off the edge of the frame, and replaces them with
+;; values on the other side of the frame.  It also has special
+;; minibuffer-handling code again, because we want to wrap through the
+;; minibuffer if it's not enabled.
+;;
+;; So, that's it.  Seems to work.  All of this work is done by the fun
+;; function `windmove-find-other-window'.
+;;
+;; So, now we have a window to move to (or nil if something's gone
+;; wrong).  The function `windmove-do-window-select' is the main
+;; driver function: it actually does the `select-window'.  It is
+;; called by four little convenience wrappers, `windmove-left',
+;; `windmove-up', `windmove-right', and `windmove-down', which make
+;; for convenient keybinding.
+
+
+;; Quick & dirty utility function to add two (x . y) coords.
+(defun windmove-coord-add (coord1 coord2)
+  "Add the two coordinates.
+Both COORD1 and COORD2 are coordinate cons pairs, (HPOS . VPOS).  The
+result is another coordinate cons pair."
+  (cons (+ (car coord1) (car coord2))
+        (+ (cdr coord1) (cdr coord2))))
+
+
+(defun windmove-constrain-to-range (n min-n max-n)
+  "Ensure that N is between MIN-N and MAX-N inclusive by constraining.
+If N is less than MIN-N, return MIN-N; if greater than MAX-N, return
+MAX-N."
+  (max min-n (min n max-n)))
+
+(defun windmove-constrain-around-range (n min-n max-n)
+  "Ensure that N is between MIN-N and MAX-N inclusive by wrapping.
+If N is less than MIN-N, return MAX-N; if greater than MAX-N, return
+MIN-N."
+  (cond
+   ((< n min-n) max-n)
+   ((> n max-n) min-n)
+   (t n)))
+
+(defun windmove-frame-edges (window)
+  "Return (X-MIN Y-MIN X-MAX Y-MAX) for the frame containing WINDOW.
+If WINDOW is nil, return the edges for the selected frame.
+(X-MIN, Y-MIN) is the zero-based coordinate of the top-left corner
+of the frame; (X-MAX, Y-MAX) is the zero-based coordinate of the
+bottom-right corner of the frame.
+For example, if a frame has 76 rows and 181 columns, the return value
+from `windmove-frame-edges' will be the list (0 0 180 75)."
+  (let ((frame (if window
+                   (window-frame window)
+                 (selected-frame))))
+    (let ((x-min 0)
+          (y-min 0)
+          (x-max (1- (frame-width frame))) ; 1- for last row & col here
+          (y-max (1- (frame-height frame))))
+      (list x-min y-min x-max y-max))))
+
+;; it turns out that constraining is always a good thing, even when
+;; wrapping is going to happen.  this is because:
+;; first, since we disallow exotic diagonal-around-a-corner type
+;; movements, so we can always fix the unimportant direction (the one
+;; we're not moving in).
+;; second, if we're moving down and we're not in the minibuffer, then
+;; constraining the y coordinate to max-y is okay, because if that
+;; falls in the minibuffer and the minibuffer isn't active, that y
+;; coordinate will still be off the bottom of the frame as the
+;; wrapping function sees it and so will get wrapped around anyway.
+(defun windmove-constrain-loc-for-movement (coord window dir)
+  "Constrain COORD so that it is reasonable for the given movement.
+This involves two things: first, make sure that the \"off\" coordinate
+-- the one not being moved on, e.g., y for horizontal movement -- is
+within frame boundaries; second, if the movement is down and we're not
+moving from the minibuffer, make sure that the y coordinate does not
+exceed the frame max-y, so that we don't overshoot the minibuffer
+accidentally.  WINDOW is the window that movement is relative to; DIR
+is the direction of the movement, one of `left', `up', `right',
+or `down'.
+Returns the constrained coordinate."
+  (let ((frame-edges (windmove-frame-edges window))
+        (in-minibuffer (window-minibuffer-p window)))
+    (let ((min-x (nth 0 frame-edges))
+          (min-y (nth 1 frame-edges))
+          (max-x (nth 2 frame-edges))
+          (max-y (nth 3 frame-edges)))
+      (let ((new-x
+             (if (memq dir '(up down))    ; vertical movement
+                 (windmove-constrain-to-range (car coord) min-x max-x)
+               (car coord)))
+            (new-y
+             (if (or (memq dir '(left right)) ; horizontal movement
+                     (and (eq dir 'down)
+                          (not in-minibuffer))) ; don't miss minibuffer
+                 ;; (technically, we shouldn't constrain on min-y in the
+                 ;; second case, but this shouldn't do any harm on a
+                 ;; down movement.)
+                 (windmove-constrain-to-range (cdr coord) min-y max-y)
+               (cdr coord))))
+        (cons new-x new-y)))))
+
+;; having constrained in the limited sense of windmove-constrain-loc-
+;; for-movement, the wrapping code is actually much simpler than it
+;; otherwise would be.  the only complication is that we need to check
+;; if the minibuffer is active, and, if not, pretend that it's not
+;; even part of the frame.
+(defun windmove-wrap-loc-for-movement (coord window dir)
+  "Takes the constrained COORD and wraps it around for the movement.
+This makes an out-of-range x or y coordinate and wraps it around the
+frame, giving a coordinate (hopefully) in the window on the other edge
+of the frame.  WINDOW is the window that movement is relative to (nil
+means the currently selected window); DIR is the direction of the
+movement, one of `left', `up', `right',or `down'.
+Returns the wrapped coordinate."
+  (let* ((frame-edges (windmove-frame-edges window))
+         (frame-minibuffer (minibuffer-window (if window
+                                                  (window-frame window)
+                                                (selected-frame))))
+         (minibuffer-active (minibuffer-window-active-p
+                               frame-minibuffer)))
+    (let ((min-x (nth 0 frame-edges))
+          (min-y (nth 1 frame-edges))
+          (max-x (nth 2 frame-edges))
+          (max-y (if (not minibuffer-active)
+                     (- (nth 3 frame-edges)
+                        (window-height frame-minibuffer))
+                   (nth 3 frame-edges))))
+      (cons
+       (windmove-constrain-around-range (car coord) min-x max-x)
+       (windmove-constrain-around-range (cdr coord) min-y max-y)))))
+
+
+
+;; `windmove-coordinates-of-position' is stolen and modified from the
+;; Emacs Lisp Reference Manual, section 27.2.5.  It seems to work
+;; okay, although I am bothered by the fact that tab-offset (the cdr
+;; of the next-to- last argument) is set to 0.  On the other hand, I
+;; can't find a single usage of `compute-motion' anywhere that doesn't
+;; set this component to zero, and I'm too lazy to grovel through the
+;; C source to figure out what's happening in the background.  there
+;; also seems to be a good deal of fun in calculating the correct
+;; width of lines for telling `compute-motion' about; in particular,
+;; it seems we need to subtract 1 (for the continuation column) from
+;; the number that `window-width' gives, or continuation lines aren't
+;; counted correctly.  I haven't seen anyone doing this before,
+;; though.
+(defun windmove-coordinates-of-position (pos &optional window)
+  "Return the coordinates of position POS in window WINDOW.
+Return the window-based coodinates in a cons pair: (HPOS . VPOS),
+where HPOS and VPOS are the zero-based x and y components of the
+screen location of POS.  If WINDOW is nil, return the coordinates in
+the currently selected window.
+As an example, if point is in the top left corner of a window, then
+the return value from `windmove-coordinates-of-position' is (0 . 0)
+regardless of the where point is in the buffer and where the window
+is placed in the frame."
+  (let* ((wind (if (null window) (selected-window) window))
+         (usable-width (1- (window-width wind))) ; 1- for cont. column
+         (usable-height (1- (window-height wind))) ; 1- for mode line
+         (big-hairy-result (compute-motion
+                            (window-start)
+                            '(0 . 0)
+                            pos
+                            (cons usable-width usable-height)
+                            usable-width
+                            (cons (window-hscroll)
+                                  0)    ; why zero?
+                            wind)))
+    (cons (nth 1 big-hairy-result)      ; hpos, not vpos as documented
+          (nth 2 big-hairy-result))))   ; vpos, not hpos as documented
+
+;; This calculates the reference location in the current window: the
+;; frame-based (x . y) of either point, the top-left, or the
+;; bottom-right of the window, depending on ARG.
+(defun windmove-reference-loc (&optional arg window)
+  "Return the reference location for directional window selection.
+Return a coordinate (HPOS . VPOS) that is frame-based.  If ARG is nil
+or not supplied, the reference point is the buffer's point in the
+currently-selected window, or WINDOW if supplied; otherwise, it is the
+top-left or bottom-right corner of the selected window, or WINDOW if
+supplied, if ARG is greater or smaller than zero, respectively."
+  (let ((effective-arg (if (null arg) 0 (prefix-numeric-value arg)))
+        (edges (window-edges window)))
+    (let ((top-left (cons (nth 0 edges)
+                          (nth 1 edges)))
+          ;; if 1-'s are not there, windows actually extend too far.
+          ;; actually, -2 is necessary for bottom: (nth 3 edges) is
+          ;; the height of the window; -1 because we want 0-based max,
+          ;; -1 to get rid of mode line
+          (bottom-right (cons (- (nth 2 edges) 1)
+                              (- (nth 3 edges) 2))))
+      (cond
+       ((> effective-arg 0)
+          top-left)
+       ((< effective-arg 0)
+          bottom-right)
+       ((= effective-arg 0)
+          (windmove-coord-add
+             top-left
+             (windmove-coordinates-of-position (window-point window)
+                                               window)))))))
+
+;; This uses the reference location in the current window (calculated
+;; by `windmove-reference-loc' above) to find a reference location
+;; that will hopefully be in the window we want to move to.
+(defun windmove-other-window-loc (dir &optional arg window)
+  "Return a location in the window to be moved to.
+Return value is a frame-based (HPOS . VPOS) value that should be moved
+to.  DIR is one of `left', `up', `right', or `down'; an optional ARG
+is handled as by `windmove-reference-loc'; WINDOW is the window that
+movement is relative to."
+  (let ((edges (window-edges window))   ; edges: (x0, y0, x1, y1)
+        (refpoint (windmove-reference-loc arg window))) ; (x . y)
+    (cond
+     ((eq dir 'left)
+      (cons (- (nth 0 edges)
+               windmove-window-distance-delta)
+            (cdr refpoint)))            ; (x0-d, y)
+     ((eq dir 'up)
+      (cons (car refpoint)
+            (- (nth 1 edges)
+               windmove-window-distance-delta))) ; (x, y0-d)
+     ((eq dir 'right)
+      (cons (+ (nth 2 edges)
+               windmove-window-distance-delta)
+            (cdr refpoint)))            ; (x1+d, y)
+     ((eq dir 'down)
+      (cons (car refpoint)
+            (+ (nth 3 edges)
+               windmove-window-distance-delta))) ; (x, y1+d)
+     (t (error "Invalid direction of movement: %s" dir)))))
+
+(defun windmove-find-other-window (dir &optional arg window)
+  "Return the window object in direction DIR.
+DIR, ARG, and WINDOW are handled as by `windmove-other-window-loc'."
+  (let* ((actual-current-window (or window (selected-window)))
+         (raw-other-window-loc
+          (windmove-other-window-loc dir arg actual-current-window))
+         (constrained-other-window-loc
+          (windmove-constrain-loc-for-movement raw-other-window-loc
+                                               actual-current-window
+                                               dir))
+         (other-window-loc
+          (if windmove-wrap-around
+            (windmove-wrap-loc-for-movement constrained-other-window-loc
+                                            actual-current-window
+                                            dir)
+            constrained-other-window-loc)))
+    (window-at (car other-window-loc)
+               (cdr other-window-loc))))
+
+
+;; Selects the window that's hopefully at the location returned by
+;; `windmove-other-window-loc', or screams if there's no window there.
+(defun windmove-do-window-select (dir &optional arg window)
+  "Moves to the window at direction DIR.
+DIR, ARG, and WINDOW are handled as by `windmove-other-window-loc'.
+If no window is at direction DIR, an error is signaled."
+  (let ((other-window (windmove-find-other-window dir arg window)))
+    (cond ((null other-window)
+           (error "No window at %s" dir))
+          ((and (window-minibuffer-p other-window)
+                (not (minibuffer-window-active-p other-window)))
+           (error "Can't move to inactive minibuffer"))
+          (t
+           (select-window other-window)))))
+
+
+;;; end-user functions
+;; these are all simple interactive wrappers to `windmove-do-
+;; window-select', meant to be bound to keys.
+
+;;;###autoload
+(defun windmove-left (&optional arg)
+  "Select the window to the left of the current one.
+With no prefix argument, or with prefix argument equal to zero,
+\"left\" is relative to the position of point in the window; otherwise
+it is relative to the top edge (for positive ARG) or the bottom edge
+(for negative ARG) of the current window.
+If no window is at the desired location, an error is signaled."
+  (interactive "P")
+  (windmove-do-window-select 'left arg))
+
+;;;###autoload
+(defun windmove-up (&optional arg)
+  "Select the window above the current one.
+With no prefix argument, or with prefix argument equal to zero, \"up\"
+is relative to the position of point in the window; otherwise it is
+relative to the left edge (for positive ARG) or the right edge (for
+negative ARG) of the current window.
+If no window is at the desired location, an error is signaled."
+  (interactive "P")
+  (windmove-do-window-select 'up arg))
+
+;;;###autoload
+(defun windmove-right (&optional arg)
+  "Select the window to the right of the current one.
+With no prefix argument, or with prefix argument equal to zero,
+\"right\" is relative to the position of point in the window;
+otherwise it is relative to the top edge (for positive ARG) or the
+bottom edge (for negative ARG) of the current window.
+If no window is at the desired location, an error is signaled."
+  (interactive "P")
+  (windmove-do-window-select 'right arg))
+
+;;;###autoload
+(defun windmove-down (&optional arg)
+  "Select the window below the current one.
+With no prefix argument, or with prefix argument equal to zero,
+\"down\" is relative to the position of point in the window; otherwise
+it is relative to the left edge (for positive ARG) or the right edge
+(for negative ARG) of the current window.
+If no window is at the desired location, an error is signaled."
+  (interactive "P")
+  (windmove-do-window-select 'down arg))
+
+
+;;; set up keybindings
+;; Idea for this function is from iswitchb.el, by Stephen Eglen
+;; (stephen@cns.ed.ac.uk).
+;; I don't think these bindings will work on non-X terminals; you
+;; probably want to use different bindings in that case.
+
+;;;###autoload
+(defun windmove-default-keybindings ()
+  "Set up default keybindings for `windmove'."
+  (interactive)
+  (global-set-key [(shift left)]  'windmove-left)
+  (global-set-key [(shift up)]    'windmove-up)
+  (global-set-key [(shift right)] 'windmove-right)
+  (global-set-key [(shift down)]  'windmove-down))
+
+
+(provide 'windmove)
+
+;;; windmove.el ends here
diff --git a/src/ChangeLog b/src/ChangeLog
index 6d68c17c1ad..6a21198d046 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2000-01-31  Gerd Moellmann  <gerd@gnu.org>
 
+        * xterm.c (xim_open_dpy): Remove unused local variable.
+
         * emacs.c (USAGE): Use term `display options' instead of `X
         options'.