Merged from miles@gnu.org--gnu-2005 (patch 292-295)

Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-292 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-293 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-294 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-295 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-342
author: Karoly Lorentey 2005-05-09 16:13:15 +0000
committer: Karoly Lorentey 2005-05-09 16:13:15 +0000
commit: 85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd (patch)
tree: 85aebc58216ed19de18354b3d9974942eea621d5 /lisp
parent: c25b55138a36cf5f334070baf79ce61c1e956eed (diff)
parent: c7bda15b58de3efcf856786167f11f5b4175e30b (diff)
download: emacs-85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd.tar.gz
emacs-85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd.zip
47 files changed, 736 insertions, 475 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3453149b6fd..d6c88be6b8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,171 @@
+2005-05-09  Juanma Barranquero  <lekktu@gmail.com>
+        * obsolete/uncompress.el: Set `find-file-not-found-functions', not
+        `find-file-not-found-hooks'; use `add-hook'.
+        (uncompress-while-visiting): Set `write-file-functions', not
+        `write-file-hooks'; use `add-hook'.
+2005-05-09  Kim F. Storm  <storm@cua.dk>
+        * emulation/cua-base.el (cua-copy-region, cua-cut-region)
+        (cua-paste): Handle clipboard action.
+        (cua--init-keymaps): Remap clipboard-kill-region and
+        clipboard-kill-ring-save.
+2005-05-08  Eli Zaretskii  <eliz@gnu.org>
+        * emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name): Improve
+        commentary.
+        * simple.el (next-error-overlay-arrow-position): Revert the change
+        made on 2005-04-30.
+2005-05-07  Jay Belanger  <belanger@truman.edu>
+        * calc/calcsel2.el (calc-commute-left, calc-commute-right)
+        (calc-sel-unpack, calc-sel-isolate): Rename variable `reselect' to
+        `calc-sel-reselect'.
+        * calc/calc-mode.el (calc-save-modes): Reset the modes list if
+        Calc is in embedded mode.
+2005-05-07  Eli Zaretskii  <eliz@gnu.org>
+        * progmodes/compile.el (compilation-setup): Set
+        overlay-arrow-string to an empty string on text terminals.
+        * textmodes/ispell.el (ispell-program-name): Try looking for
+        "aspell" along exec-path, and if found, use it as the default
+        speller program.
+2005-05-07  Jirka Kosek  <jirka@kosek.cz>  (tiny change)
+        * international/mule.el (sgml-xml-auto-coding-function): Recognize
+        encoding='FOO' in single quotes as well as in double quotes.
+2005-05-07  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
+        * emacs-lisp/cl-macs.el (cl-transform-lambda): Recognize `declare'
+        as well as `interactive', so that defmacro* would recognize
+        `declare' forms.
+2005-05-07  Eli Zaretskii  <eliz@gnu.org>
+        * emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name): Explain
+        more about the LIGHTER arg's usage in the doc string.  Add
+        commentary to clarify what the code does.  Fix the regexp that
+        strips whitespace from LIGHTER.  Quote LIGHTER before using it,
+        since it could have characters special to regular expressions.
+2005-05-07  Matt Hodges  <MPHodges@member.fsf.org>  (tiny change)
+        * replace.el (occur-1): Bind inhibit-read-only so that
+        erase-buffer doesn't barf on read-only text properties (likewise
+        for add-text-properties in occur-engine).  Mark buffer as
+        unmodified.
+        (occur-engine): Don't set buffer-read-only here.
+2005-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * pcvs.el (cvs-mode-commit, cvs-mode-edit-log): Don't fiddle with
+        list-buffers-directory.  This caused the *cvs-commit* buffer to be
+        sometimes mistakenly reused as a *cvs* buffer.
+2005-05-07  Nick Roberts  <nickrob@snap.net.nz>
+        * tooltip.el: Move code for GUD tooltips into gud.el.
+        (require): CL no longer needed to compile case.
+        (tooltip-mode): Do not toggle functions for GUD tooltips.
+        (tooltip-gud-tips-p): Remove. Replace with minor mode
+        gud-tooltip-mode in gud.el.
+        (tooltip-gud-modes, tooltip-gud-display, tooltip-gud-echo-area)
+        (tooltip-gud-toggle-dereference): Rename in gud.el by replacing
+        tooltip-gud prefix with gud-tooltip and obsolete.
+        (tooltip-change-major-mode, tooltip-activate-mouse-motions-if-enabled)
+        (tooltip-mouse-motions-active, tooltip-activate-mouse-motions)
+        (tooltip-mouse-motion): Mouse movement functions/variable.
+        Rename in gud.el by adding gud prefix.
+        (tooltip-gud-original-filter, tooltip-gud-dereference)
+        (tooltip-gud-event, tooltip-toggle-gud-tips)
+        (tooltip-gud-process-output, tooltip-gud-print-command)
+        (tooltip-gud-tips): GUD tooltip functions/variables. Rename in
+        gud.el by replacing tooltip-gud prefix with gud-tooltip.
+        (gdb-tooltip-print): Move to gdb-ui.el.
+        * progmodes/gud.el: Move code for GUD tooltips from tooltip.el.
+        (require): CL needed to compile case.
+        (gud-tooltip-mode): Use to toggle GUD tooltips unstead of
+        tooltip-gud-tips-p. Make it a minor-mode.
+        (gud-find-file): Only prepare GUD tooltips if gud-tooltip-mode is t.
+        (gud-menu-map): GUD tooltips use gud-tooltip-mode now.
+        (gud-tooltip-modes, gud-tooltip-display, gud-tooltip-echo-area)
+        (gud-tooltip-change-major-mode)
+        (gud-tooltip-activate-mouse-motions-if-enabled)
+        (gud-tooltip-mouse-motions-active, gud-tooltip-activate-mouse-motions)
+        (gud-tooltip-mouse-motion, gud-tooltip-toggle-dereference)
+        (gud-tooltip-original-filter, gud-tooltip-dereference)
+        (gud-tooltip-event, tooltip-toggle-gud-tips)
+        (gud-tooltip-process-output, gud-tooltip-print-command)
+        (gud-tooltip-tips): Move from tooltip.el.
+        * progmodes/gdb-ui.el (gdb-tooltip-print): Move from tooltip.el.
+        (gdb-cpp-define-alist-flags): Doc fix.
+        (gdb-set-gud-minor-mode-1): Only prepare GUD tooltips if
+        gud-tooltip-mode is t.
+2005-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * net/goto-addr.el (goto-address-fontify): Make sure the overlays
+        evaporate if their text is deleted.
+        (goto-address-at-point): Make it work as a mouse binding as well.
+        (goto-address-at-mouse): Obsolete it.  Update users.
+2005-05-06  Glenn Morris  <gmorris@ast.cam.ac.uk>
+        * calendar/appt.el (top-level): No longer activate on load.
+2005-05-06  Juanma Barranquero  <lekktu@gmail.com>
+        * calendar/cal-bahai.el (mark-bahai-diary-entries):
+        * net/webjump.el (webjump):
+        * progmodes/idlw-help.el (idlwave-do-context-help1)
+        (idlwave-highlight-linked-completions):
+        * textmodes/po.el (po-find-file-coding-system-guts):
+        Replace `assoc-ignore-case' by `assoc-string'.
+2005-05-06  Eli Zaretskii  <eliz@gnu.org>
+        * files.el (locate-file): Doc fix.
+        * progmodes/gdb-ui.el (gdb-cpp-define-alist-program): Doc fix.
+        Remove the redundant test for ms-dos.
+        * progmodes/cmacexp.el (c-macro-preprocessor): Use locate-file to
+        look for the preprocessor with exec-suffixes.  If not found in
+        standard places, look in exec-path.  Remove most of the tests that
+        used system-type.
+        * loadup.el: Load jka-cmpr-hook instead of jka-comp-hook.
+        * jka-compr.el (jka-compr-uninstall): Add autoload cookie.
+        * jka-cmpr-hook.el: Renamed from jka-comp-hook.el, to avoid
+        file-name clash with jka-compr.el on 8+3 filesystems.
+2005-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+        * term/mac-win.el: Don't define or bind scroll bar functions if
+        x-toolkit-scroll-bars is t.
+        (x-select-text, x-get-selection-value):
+        Clear x-last-selected-text-clipboard if x-select-enable-clipboard is
+        nil.
+        (PRIMARY): Put mac-scrap-name property.
+        (mac-select-convert-to-file-url): New function.
+        (public.file-url): New selection target type.  Add to
+        selection-converter-alist.
+        (x-get-selection, x-selection-value): Handle it.
+        (x-cut-buffer-or-selection-value): New alias.
 2005-05-05  Luc Teirlinck  <teirllm@auburn.edu>
        * emacs-lisp/byte-run.el (define-obsolete-function-alias)
@@ -22,8 +190,8 @@
        (ido-file-internal): Add with-no-warnings around ffap and dired code.
        (ido-exit-minibuffer): Use exit-minibuffer instead of throw.
        (ido-wide-find-file, ido-wide-find-dir): Catch quit to cancel find.
-        (ido-push-dir, ido-pop-dir, ido-wide-find-file-or-pop-dir): New
+        (ido-push-dir, ido-pop-dir, ido-wide-find-file-or-pop-dir):
-        functions for M-b/M-f to move among the directory components.
+        New functions for M-b/M-f to move among the directory components.
        (ido-make-merged-file-list): Catch quit to cancel merge.
        (ido-make-dir-list): Delete "." when ido-input-stack is non-empty.
        (ido-completion-help): No warnings for ido-completion-buffer-full.
@@ -38,8 +206,8 @@
 2005-05-05  Juanma Barranquero  <lekktu@gmail.com>
-        * emacs-lisp/byte-run.el (define-obsolete-function-alias): Fix
+        * emacs-lisp/byte-run.el (define-obsolete-function-alias):
-        typo in docstring.
+        Fix typo in docstring.
        * progmodes/ebrowse.el (ebrowse-install-1-to-9-keys)
        (ebrowse-print-statistics-line)
@@ -55,12 +223,17 @@
        * progmodes/gdb-ui.el (gdb-cpp-define-alist-flags): New variable.
        (gdb-create-define-alist): Use it.
-        (gdb-cpp-define-alist-program): Update for MS-DOS?
+        (gdb-cpp-define-alist-program): Update for MS-DOS.
 2005-05-04  Nick Roberts  <nickrob@snap.net.nz>
        * progmodes/cmacexp.el (c-macro-preprocessor): Update for Mac OSX.
+2005-05-04  Richard M. Stallman  <rms@gnu.org>
+        * simple.el (line-move-1): Fix previous change to signal errors
+        appropriately.
 2005-05-03  Ulf Jasper  <ulf.jasper@web.de>
        * calendar/icalendar.el (icalendar-version): Now at 0.12.
@@ -218,10 +391,10 @@
        * loadup.el: load jka-comp-hook.
-        * jka-compr.el: Many functions and vars moved to jka-compr-hook.el.
+        * jka-compr.el: Many functions and vars moved to jka-comp-hook.el.
        (jka-compr-handler): Add autoload.  `put' calls moved
-        to jka-compr-hook.el.
+        to jka-comp-hook.el.
-        (compression, jka-compr): defgroups moved to jka-compr-hook.el.
+        (compression, jka-compr): defgroups moved to jka-comp-hook.el.
        (jka-compr-inhibit): Autoload.
        * jka-comp-hook.el: New file.
@@ -2189,7 +2362,7 @@
        (menu-bar-showhide-menu): Use menu-bar-make-mm-toggle.
        (menu-bar-make-mm-toggle): Simplify.
-2005-03-22  JUAN-LEON Lahoz Garcia <juanleon1@gmail.com>
+2005-03-22  JUAN-LEON Lahoz Garcia  <juanleon1@gmail.com>
        * progmodes/perl-mode.el (perl-font-lock-keywords-2):
        Accept qualified variable and function names.
@@ -2363,7 +2536,7 @@
        (recentf-cleanup): Use it to conditionally check availablity of
        remote files.
-2005-03-19  Joe Edmonds <joe-bugs-debian-org@elem.com>  (tiny change)
+2005-03-19  Joe Edmonds  <joe-bugs-debian-org@elem.com>  (tiny change)
        * emacs-lisp/lisp-mode.el (lisp-mode-variables): Recognize `@' in
        function names.
@@ -3938,7 +4111,7 @@
        (bibtex-parse-field-name): Fix typos in docstrings.
        (bibtex-field-list, bibtex-find-crossref): Fix typos in error messages.
-2005-01-24  Carsten Dominik <dominik@science.uva.nl>
+2005-01-24  Carsten Dominik  <dominik@science.uva.nl>
        * textmodes/reftex-global.el (reftex-isearch-push-state-function)
        (reftex-isearch-pop-state-function, reftex-isearch-isearch-search)
@@ -5070,7 +5243,7 @@
        * ffap.el (ffap-string-at-point-mode-alist): Add "*" to url chars,
        it can appear unencoded and has been seen from yahoo.
-2004-12-27  Sergey Poznyakoff <gray@Mirddin.farlep.net>  (tiny change)
+2004-12-27  Sergey Poznyakoff  <gray@Mirddin.farlep.net>  (tiny change)
        * mail/smtpmail.el (smtpmail-try-auth-methods): Send AUTH CRAM-MD5
        in upper case.  Reported by Wojciech Polak <polak@gnu.org>.
@@ -6440,7 +6613,7 @@
        other frames.
        (gdb-reset): Remove dedicated property after debugging.
-2004-11-24  Jay Belanger <belanger@truman.edu>
+2004-11-24  Jay Belanger  <belanger@truman.edu>
        * calc/calc-sel.el: Add comment.
@@ -7728,7 +7901,7 @@
        (gud-gdba-command-name, gdb-show-main, gdb-many-windows):
        Add :version keyword.
-2004-11-02  Pavel Kobiakov <pk_at_work@yahoo.com>
+2004-11-02  Pavel Kobiakov  <pk_at_work@yahoo.com>
        * progmodes/flymake.el (flymake-err-line-patterns):
        Use `flymake-reformat-err-line-patterns-from-compile-el' to convert
@@ -8137,7 +8310,7 @@
        Handle periods and underscores in a function name.
        Remove the address fontification.
-2004-10-24 Masatake YAMATO <jet@gyve.org>
+2004-10-24  Masatake YAMATO  <jet@gyve.org>
        * progmodes/asm-mode.el (asm-font-lock-keywords):
        Use font-lock-variable-name-face for registers.
@@ -8279,7 +8452,7 @@
        * paths.el (news-path): Fix previous change.
-2004-10-18 Jay Belanger  <belanger@truman.edu>
+2004-10-18  Jay Belanger  <belanger@truman.edu>
        * calc/calc-help.el (calc-describe-bindings):
        Set `buffer-read-only' to nil while working in the keybindings buffer;
@@ -9419,7 +9592,7 @@
        * terminal.el (te-escape): Show `?' in prompt for help key.
-2004-09-04  Emilio C. Lopes <eclig@gmx.net>
+2004-09-04  Emilio C. Lopes  <eclig@gmx.net>
        * emacs-lisp/lisp.el (kill-backward-up-list): New function.
@@ -9827,7 +10000,7 @@
        * imenu.el: Several doc fixes: don't say variables are buffer-local.
-2004-08-16  Davis Herring <herring@lanl.gov>
+2004-08-16  Davis Herring  <herring@lanl.gov>
        * isearch.el (isearch-string, isearch-message-string, isearch-point)
        (isearch-success, isearch-forward-flag, isearch-other-end)
diff --git a/lisp/calc/README b/lisp/calc/README
index a9e2813673c..a307b711f1e 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -2,7 +2,7 @@
 This directory contains Calc, an advanced desk calculator for GNU
 Emacs.
-"Calc"  Copyright 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+"Calc"  Copyright 1990, 1991, 1992, 1993, 2001, 2005  Free Software Foundation, Inc.
 Written by:
        Dave Gillespie
@@ -52,20 +52,9 @@ From the introduction to the manual:
 Calc is written entirely in Emacs Lisp, for maximum portability.
-You do not need to recompile Emacs to install and use Calc.
-You will need about six megabytes of disk space to install Calc
-and its Info documentation.
-See the file INSTALL for installation instructions.  The instructions
-may seem long, but on typical systems you will only need to follow the
-steps shown in the first section.
-Don't even try to run Calc in uncompiled (.el) form!  It's far too slow.
 I am anxious to hear about your experiences using Calc.  Send mail to
-"daveg@synaptics.com".  A bug report is most useful if you include the
+"belanger@truman.edu".  A bug report is most useful if you include the
 exact input and output that occurred, any modes in effect (such as the
 current precision), and so on.  If you find Calc is difficult to operate
 in any way, or if you have other suggestions, don't hesitate to let me
@@ -73,21 +62,32 @@ know.  If you find errors (including simple typos) in the manual, let
 me know.  Even if you find no bugs at all I would love to hear your
 opinions.
-The latest Calc tar files and patches are always available for anonymous
-FTP on prep.ai.mit.edu.
-Thanks,
-                                                                -- Dave
+Summary of changes to "Calc"
+------- -- ------- --  ----
+Version 2.1:
+* Added new functions: sec, csc, cot, sech, csch, coth.
+* 0^0 now evaluates to 1.
-Summary of changes to "Calc"
+* Added a new language mode for LaTeX.
------- -- ------- --  ----
+* Calc now tries to use an appropriate language mode in embedded mode.
+* Calc now restores original modes when leaving embedded mode.
+* User settable variables which are not set with keystrokes are now
+  customizable.
+* Made ~/.calc.el the default Calc settings file.
+* Miscellaneous updates and bugfixes.
 Version 2.02f:
 * Fixed a bug which broke `I', `H', `K' prefix keys in recent Emacs.
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index b722261907d..45d66231835 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -1,6 +1,6 @@
 ;;; calc-alg.el --- algebraic functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger  <belanger@truman.edu>
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index d9acc2ebc52..bba7a8fe942 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1,6 +1,6 @@
 ;;; calc-arith.el --- arithmetic functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index adb8fcecce6..c7bf225fe7c 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1,6 +1,6 @@
 ;;; calc-comb.el --- combinatoric functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 4f45419c136..6b94cd0af0c 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -148,6 +148,15 @@
          (setq calc-embedded-original-modes (cons lang modes)))
      (setq calc-embedded-original-modes nil))))
+(defun calc-embedded-preserve-modes ()
+  "Preserve the current modes when leaving embedded mode."
+  (interactive)
+  (if calc-embedded-info
+      (progn
+        (calc-embedded-save-original-modes)
+        (message "Current modes will be preserved when leaving embedded mode."))
+    (message "Not in embedded mode.")))
 (defun calc-embedded-restore-original-modes ()
  "Restore the original Calc modes when leaving embedded mode."
  (let ((calcbuf (get-buffer "*Calculator*"))
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index df9f9512aaa..5b23dabbbf5 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -378,6 +378,7 @@
  (define-key calc-mode-map "m?" 'calc-m-prefix-help)
  (define-key calc-mode-map "ma" 'calc-algebraic-mode)
  (define-key calc-mode-map "md" 'calc-degrees-mode)
+  (define-key calc-mode-map "me" 'calc-embedded-preserve-modes)
  (define-key calc-mode-map "mf" 'calc-frac-mode)
  (define-key calc-mode-map "mg" 'calc-get-modes)
  (define-key calc-mode-map "mh" 'calc-hms-mode)
@@ -737,7 +738,8 @@ math-polar math-want-polar)
 ("calc-embed" calc-do-embedded
 calc-do-embedded-activate calc-embedded-evaluate-expr
-calc-embedded-modes-change calc-embedded-var-change)
+calc-embedded-modes-change calc-embedded-var-change
+calc-embedded-preserve-modes)
 ("calc-fin" calc-to-percentage calcFunc-ddb
 calcFunc-fv calcFunc-fvb calcFunc-fvl calcFunc-irr calcFunc-irrb
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 9510507e276..67cc5270942 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -1,6 +1,6 @@
 ;;; calc-lang.el --- calc language functions
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index ffb7644cdfe..bd939e1669c 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -1,6 +1,6 @@
 ;;; calc-math.el --- mathematical functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 8040d28d083..3b2f95d9be8 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -1,6 +1,6 @@
 ;;; calc-misc.el --- miscellaenous functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 389b52385b6..1c5bd29e804 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -304,7 +304,9 @@
               vals (cdr vals))))
     (run-hooks 'calc-mode-save-hook)
     (insert ";;; End of mode settings\n")
-     (save-buffer))))
+     (save-buffer)
+     (if calc-embedded-info
+         (calc-embedded-save-original-modes)))))
 (defun calc-settings-file-name (name &optional arg)
  (interactive
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index 95fdba2562c..e887e77030e 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1,6 +1,6 @@
 ;;; calc-poly.el --- polynomial functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index f5788fa6e84..c520c4d390c 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -1,6 +1,6 @@
 ;;; calc-rewr.el --- rewriting functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 52f0cc0272d..f59cad99802 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,6 +1,6 @@
 ;;; calc-store.el --- value storage functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 8d2180c9c47..288ec70b00e 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -1,6 +1,6 @@
 ;;; calc-stuff.el --- miscellaneous functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 2ae327b36bf..efe2e30ce71 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1,6 +1,6 @@
 ;;; calc-vec.el --- vector functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index d2459919fda..7e502aa1a87 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -1,6 +1,6 @@
 ;;; calcalg2.el --- more algebraic functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index 90ceaea68db..bbba841c220 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -1,6 +1,6 @@
 ;;; calcalg3.el --- more algebraic functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 305e155843e..70ceb01da64 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1,6 +1,6 @@
 ;;; calccomp.el --- composition functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index 28944755a1b..20020f57468 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -34,6 +34,10 @@
 ;; The variable calc-keep-selection is declared and set in calc-sel.el.
 (defvar calc-keep-selection)
+;; The variable calc-sel-reselect is local to the methods below,
+;; but is used by some functions in calc-sel.el which are called
+;; by the functions below.
 (defun calc-commute-left (arg)
  (interactive "p")
  (if (< arg 0)
@@ -41,7 +45,7 @@
    (calc-wrapper
     (calc-preserve-point)
     (let ((num (max 1 (calc-locate-cursor-element (point))))
-           (reselect calc-keep-selection))
+           (calc-sel-reselect calc-keep-selection))
       (if (= arg 0) (setq arg nil))
       (while (or (null arg) (>= (setq arg (1- arg)) 0))
         (let* ((entry (calc-top num 'entry))
@@ -106,14 +110,14 @@
           (if (null new)
               (if arg
                   (error "Term is already leftmost")
-                 (or reselect
+                 (or calc-sel-reselect
                     (calc-pop-push-list 1 (list expr) num '(nil)))
                 (setq arg 0))
             (calc-pop-push-record-list
              1 "left"
              (list (calc-replace-sub-formula expr parent new))
              num
-              (list (and (or (not (eq arg 0)) reselect)
+              (list (and (or (not (eq arg 0)) calc-sel-reselect)
                         sel))))))))))
 (defun calc-commute-right (arg)
@@ -123,7 +127,7 @@
    (calc-wrapper
     (calc-preserve-point)
     (let ((num (max 1 (calc-locate-cursor-element (point))))
-           (reselect calc-keep-selection))
+           (calc-sel-reselect calc-keep-selection))
       (if (= arg 0) (setq arg nil))
       (while (or (null arg) (>= (setq arg (1- arg)) 0))
         (let* ((entry (calc-top num 'entry))
@@ -189,14 +193,14 @@
           (if (null new)
               (if arg
                   (error "Term is already rightmost")
-                 (or reselect
+                 (or calc-sel-reselect
                     (calc-pop-push-list 1 (list expr) num '(nil)))
                 (setq arg 0))
             (calc-pop-push-record-list
              1 "rght"
              (list (calc-replace-sub-formula expr parent new))
              num
-              (list (and (or (not (eq arg 0)) reselect)
+              (list (and (or (not (eq arg 0)) calc-sel-reselect)
                         sel))))))))))
 (defun calc-build-assoc-term (op lhs rhs)
@@ -225,7 +229,7 @@
  (calc-wrapper
   (calc-preserve-point)
   (let* ((num (max 1 (calc-locate-cursor-element (point))))
-          (reselect calc-keep-selection)
+          (calc-sel-reselect calc-keep-selection)
          (entry (calc-top num 'entry))
          (expr (car entry))
          (sel (or (calc-auto-selection entry) expr)))
@@ -236,14 +240,14 @@
                                (list (calc-replace-sub-formula
                                       expr sel (nth 1 sel)))
                                num
-                                (list (and reselect (nth 1 sel)))))))
+                                (list (and calc-sel-reselect (nth 1 sel)))))))
 (defun calc-sel-isolate ()
  (interactive)
  (calc-slow-wrapper
   (calc-preserve-point)
   (let* ((num (max 1 (calc-locate-cursor-element (point))))
-          (reselect calc-keep-selection)
+          (calc-sel-reselect calc-keep-selection)
          (entry (calc-top num 'entry))
          (expr (car entry))
          (sel (or (calc-auto-selection entry) (error "No selection")))
@@ -266,7 +270,7 @@
                                (list (calc-replace-sub-formula
                                       expr eqn soln))
                                num
-                                (list (and reselect sel)))
+                                (list (and calc-sel-reselect sel)))
     (calc-handle-whys))))
 (defun calc-sel-commute (many)
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 8ace0be910b..d007e5b4546 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -688,10 +688,6 @@ ARG is positive, otherwise off."
      (appt-check t))))
-;; This is needed for backwards compatibility. Feh.
-(appt-activate 1)
 (provide 'appt)
 ;;; arch-tag: bf5791c4-8921-499e-a26f-772b1788d347
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 4dfd8eb16e5..2bcfaf648ec 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -375,19 +375,21 @@ nongregorian-diary-marking-hook."
                         (string-to-int y-str)))))
            (if dd-name
                (mark-calendar-days-named
-                 (cdr (assoc-ignore-case (substring dd-name 0 3)
+                 (cdr (assoc-string (substring dd-name 0 3)
-                                         (calendar-make-alist
+                                    (calendar-make-alist
-                                          calendar-day-name-array
+                                     calendar-day-name-array
-                                          0
+                                     0
-                                          '(lambda (x) (substring x 0 3))))))
+                                     '(lambda (x) (substring x 0 3)))
+                                    t)))
              (if mm-name
                  (if (string-equal mm-name "*")
                      (setq mm 0)
                    (setq mm
-                          (cdr (assoc-ignore-case
+                          (cdr (assoc-string
                                mm-name
                                (calendar-make-alist
-                                  bahai-calendar-month-name-array))))))
+                                  bahai-calendar-month-name-array)
+                                t)))))
              (mark-bahai-calendar-date-pattern mm dd yy)))))
      (setq d (cdr d)))))
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 57a6c6a40a8..5eca356af59 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -4,6 +4,7 @@
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;      Denis B. Roegel <Denis.Roegel@loria.fr>
+;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
 ;; Keywords: calendar
 ;; Human-Keywords: sunrise, sunset, equinox, solstice, calendar, diary,
 ;;      holidays
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 4a46801763a..aae2fd9f3d8 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -233,7 +233,8 @@ ARGLIST allows full Common Lisp conventions."
         (bind-defs nil) (bind-enquote nil)
         (bind-inits nil) (bind-lets nil) (bind-forms nil)
         (header nil) (simple-args nil))
-    (while (or (stringp (car body)) (eq (car-safe (car body)) 'interactive))
+    (while (or (stringp (car body))
+               (memq (car-safe (car body)) '(interactive declare)))
      (push (pop body) header))
    (setq args (if (listp args) (copy-list args) (list '&rest args)))
    (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p)))))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 831ffb2d576..a02f7be7d13 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -58,16 +58,31 @@
 (defun easy-mmode-pretty-mode-name (mode &optional lighter)
  "Turn the symbol MODE into a string intended for the user.
-If provided LIGHTER will be used to help choose capitalization."
+If provided, LIGHTER will be used to help choose capitalization by,
+replacing its case-insensitive matches with the literal string in LIGHTER."
  (let* ((case-fold-search t)
+         ;; Produce "Foo-Bar minor mode" from foo-bar-minor-mode.
         (name (concat (replace-regexp-in-string
+                        ;; If the original mode name included "-minor" (some
+                        ;; of them don't, e.g. auto-revert-mode), then
+                        ;; replace it with " minor".
                        "-Minor" " minor"
+                        ;; "foo-bar-minor" -> "Foo-Bar-Minor"
                        (capitalize (replace-regexp-in-string
+                                     ;; "foo-bar-minor-mode" -> "foo-bar-minor"
                                     "-mode\\'" "" (symbol-name mode))))
                       " mode")))
    (if (not (stringp lighter)) name
-      (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\-s+\\'" "" lighter))
+      ;; Strip leading and trailing whitespace from LIGHTER.
-      (replace-regexp-in-string lighter lighter name t t))))
+      (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\s-+\\'" ""
+                                              lighter))
+      ;; Replace any (case-insensitive) matches for LIGHTER in NAME
+      ;; with a literal LIGHTER.  E.g., if NAME is "Iimage mode" and
+      ;; LIGHTER is " iImag", then this will produce "iImage mode".
+      ;; (LIGHTER normally comes from the mode-line string passed to
+      ;; define-minor-mode, and normally includes at least one leading
+      ;; space.)
+      (replace-regexp-in-string (regexp-quote lighter) lighter name t t))))
 ;;;###autoload
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 2a515bc95f7..e9679c66dd3 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -777,9 +777,13 @@ With numeric prefix arg, copy to register 0-9 instead."
  (let ((start (mark)) (end (point)))
    (or (<= start end)
        (setq start (prog1 end (setq end start))))
-    (if cua--register
+    (cond
-        (copy-to-register cua--register start end nil)
+     (cua--register
-      (copy-region-as-kill start end))
+      (copy-to-register cua--register start end nil))
+     ((eq this-original-command 'clipboard-kill-ring-save)
+      (clipboard-kill-ring-save start end))
+     (t
+      (copy-region-as-kill start end)))
    (if cua-keep-region-after-copy
        (cua--keep-active)
      (cua--deactivate))))
@@ -795,9 +799,13 @@ With numeric prefix arg, copy to register 0-9 instead."
    (let ((start (mark)) (end (point)))
      (or (<= start end)
          (setq start (prog1 end (setq end start))))
-      (if cua--register
+      (cond
-          (copy-to-register cua--register start end t)
+       (cua--register
-        (kill-region start end)))
+        (copy-to-register cua--register start end t))
+       ((eq this-original-command 'clipboard-kill-region)
+        (clipboard-kill-region start end))
+       (t
+        (kill-region start end))))
    (cua--deactivate)))
 ;;; Generic commands for regions, rectangles, and global marks
@@ -864,6 +872,8 @@ If global mark is active, copy from register or one character."
          (cua--insert-rectangle (cdr cua--last-killed-rectangle)
                                 nil paste-column paste-lines)
          (if arg (goto-char pt))))
+       ((eq this-original-command 'clipboard-yank)
+        (clipboard-yank))
       (t (yank arg)))))))
 (defun cua-paste-pop (arg)
@@ -1282,9 +1292,11 @@ If ARG is the atom `-', scroll upward by nearly full screen."
  (define-key cua--region-keymap [remap delete-char]            'cua-delete-region)
  ;; kill region
  (define-key cua--region-keymap [remap kill-region]            'cua-cut-region)
+  (define-key cua--region-keymap [remap clipboard-kill-region]  'cua-cut-region)
  ;; copy region
  (define-key cua--region-keymap [remap copy-region-as-kill]    'cua-copy-region)
  (define-key cua--region-keymap [remap kill-ring-save]         'cua-copy-region)
+  (define-key cua--region-keymap [remap clipboard-kill-ring-save] 'cua-copy-region)
  ;; cancel current region/rectangle
  (define-key cua--region-keymap [remap keyboard-escape-quit]   'cua-cancel)
  (define-key cua--region-keymap [remap keyboard-quit]          'cua-cancel)
diff --git a/lisp/files.el b/lisp/files.el
index d8aaaaf76fe..deda9dca2a7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -632,8 +632,13 @@ The path separator is colon in GNU and GNU-like systems."
 (defun locate-file (filename path &optional suffixes predicate)
  "Search for FILENAME through PATH.
+If found, return the absolute file name of FILENAME, with its suffixes;
+otherwise return nil.
+PATH should be a list of directories to look in, like the lists in
+`exec-path' or `load-path'.
 If SUFFIXES is non-nil, it should be a list of suffixes to append to
 file name when searching.  If SUFFIXES is nil, it is equivalent to '(\"\").
+Use '(\"/\") to disable PATH search, but still try the suffixes in SUFFIXES.
 If non-nil, PREDICATE is used instead of `file-readable-p'.
 PREDICATE can also be an integer to pass to the `access' system call,
 in which case file-name handlers are ignored.  This usage is deprecated.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 1a3db49a667..94424dad302 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2188,9 +2188,9 @@ This function is intended to be added to `auto-coding-functions'."
  (when (re-search-forward "\\`[[:space:]\n]*<\\?xml" size t)
    (let ((end (save-excursion
                 ;; This is a hack.
-                 (re-search-forward "\"\\s-*\\?>" size t))))
+                 (re-search-forward "[\"']\\s-*\\?>" size t))))
      (when end
-        (if (re-search-forward "encoding=\"\\(.+?\\)\"" end t)
+        (if (re-search-forward "encoding=[\"']\\(.+?\\)[\"']" end t)
            (let* ((match (match-string 1))
                   (sym (intern (downcase match))))
              (if (coding-system-p sym)
diff --git a/lisp/jka-comp-hook.el b/lisp/jka-cmpr-hook.el
index ead50b76343..79b47130baf 100644
--- a/lisp/jka-comp-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -1,4 +1,4 @@
-;;; jka-comp-hook.el --- preloaded code to enable jka-compr.el
+;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2003, 2004, 2005  Free Software Foundation, Inc.
@@ -287,7 +287,7 @@ Returns the new status of auto compression (non-nil means on)."
 ;;; Turn on the mode.
 (auto-compression-mode 1)
-(provide 'jka-comp-hook)
+(provide 'jka-cmpr-hook)
 ;; arch-tag: 4bd73429-f400-45fe-a065-270a113e31a8
-;;; jka-comp-hook.el ends here
-\ No newline at end of file
+;;; jka-cmpr-hook.el ends here
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index ec2eab463cc..ca5e158349d 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -669,7 +669,7 @@ It is not recommended to set this variable permanently to anything but nil.")
        (inhibit-file-name-operation operation))
    (apply operation args)))
+;;;###autoload
 (defun jka-compr-uninstall ()
  "Uninstall jka-compr.
 This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 0963f5150ad..d5f97e49245 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -203,7 +203,7 @@
 (message "%s" (garbage-collect))
 (load "vc-hooks")
-(load "jka-comp-hook")
+(load "jka-cmpr-hook")
 (load "ediff-hook")
 (if (fboundp 'x-show-tip) (load "tooltip"))
 (message "%s" (garbage-collect))
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 95a13b620a2..54d5854ca80 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -1,6 +1,6 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
-;; Copyright (C) 1995, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2000, 2001, 2005  Free Software Foundation, Inc.
 ;; Author: Eric Ding <ericding@alum.mit.edu>
 ;; Maintainer: FSF
@@ -46,7 +46,7 @@
 ;;
 ;; (setq goto-address-highlight-keymap
 ;;   (let ((m (make-sparse-keymap)))
-;;     (define-key m [S-mouse-2] 'goto-address-at-mouse)
+;;     (define-key m [S-mouse-2] 'goto-address-at-point)
 ;;     m))
 ;;
@@ -118,9 +118,8 @@ A value of t means there is no limit--fontify regardless of the size."
 (defvar goto-address-highlight-keymap
  (let ((m (make-sparse-keymap)))
-    (if (featurep 'xemacs)
+    (define-key m (if (featurep 'xemacs) (kbd "<button2>") (kbd "<mouse-2>"))
-        (define-key m (kbd "<button2>") 'goto-address-at-mouse)
+      'goto-address-at-point)
-      (define-key m (kbd "<mouse-2>") 'goto-address-at-mouse))
    (define-key m (kbd "C-c RET") 'goto-address-at-point)
    m)
  "keymap to hold goto-addr's mouse key defs under highlighted URLs.")
@@ -165,6 +164,7 @@ and `goto-address-fontify-p'."
                     (this-overlay (make-overlay s e)))
                (and goto-address-fontify-p
                     (overlay-put this-overlay 'face goto-address-url-face))
+                (overlay-put this-overlay 'evaporate t)
                (overlay-put this-overlay
                             'mouse-face goto-address-url-mouse-face)
                (overlay-put this-overlay
@@ -179,6 +179,7 @@ and `goto-address-fontify-p'."
                     (this-overlay (make-overlay s e)))
                (and goto-address-fontify-p
                     (overlay-put this-overlay 'face goto-address-mail-face))
+                (overlay-put this-overlay 'evaporate t)
                (overlay-put this-overlay 'mouse-face
                             goto-address-mail-mouse-face)
                (overlay-put this-overlay
@@ -191,24 +192,18 @@ and `goto-address-fontify-p'."
 ;; snarfed from browse-url.el
 ;;;###autoload
-(defun goto-address-at-mouse (event)
+(define-obsolete-function-alias
-  "Send to the e-mail address or load the URL clicked with the mouse.
+  'goto-address-at-mouse 'goto-address-at-point "22.1")
-Send mail to address at position of mouse click.  See documentation for
-`goto-address-find-address-at-point'.  If no address is found
-there, then load the URL at or before the position of the mouse click."
-  (interactive "e")
-  (save-excursion
-    (mouse-set-point event)
-    (goto-address-at-point)))
 ;;;###autoload
-(defun goto-address-at-point ()
+(defun goto-address-at-point (&optional event)
  "Send to the e-mail address or load the URL at point.
 Send mail to address at point.  See documentation for
 `goto-address-find-address-at-point'.  If no address is found
 there, then load the URL at or before point."
-  (interactive)
+  (interactive (list last-input-event))
  (save-excursion
+    (if event (mouse-set-point event))
    (let ((address (save-excursion (goto-address-find-address-at-point))))
      (if (and address
               (save-excursion
@@ -248,5 +243,5 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 (provide 'goto-addr)
-;;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
+;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
 ;;; goto-addr.el ends here
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 3f004b8864e..0fc47fafa85 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -274,9 +274,9 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 <nwv@acm.org>."
  (interactive)
  (let* ((completion-ignore-case t)
-         (item (assoc-ignore-case
+         (item (assoc-string
                (completing-read "WebJump to site: " webjump-sites nil t)
-                webjump-sites))
+                webjump-sites t))
         (name (car item))
         (expr (cdr item)))
    (browse-url (webjump-url-fix
diff --git a/lisp/obsolete/uncompress.el b/lisp/obsolete/uncompress.el
index ac567be67b0..28ad5f06c7b 100644
--- a/lisp/obsolete/uncompress.el
+++ b/lisp/obsolete/uncompress.el
@@ -83,14 +83,10 @@ It then selects a major mode from the uncompressed file name and contents."
  (goto-char (point-min))
  (message "Uncompressing...done")
  (set-buffer-modified-p nil)
-  (make-local-variable 'write-file-hooks)
+  (add-hook 'write-file-functions 'uncompress-backup-file nil t)
-  (or (memq 'uncompress-backup-file write-file-hooks)
-      (setq write-file-hooks (cons 'uncompress-backup-file write-file-hooks)))
  (normal-mode))
-(or (memq 'find-compressed-version find-file-not-found-hooks)
+(add-hook 'find-file-not-found-functions 'find-compressed-version)
-    (setq find-file-not-found-hooks
-          (cons 'find-compressed-version find-file-not-found-hooks)))
 (defun find-compressed-version ()
  "Hook to read and uncompress the compressed version of a file."
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 6382705139e..7c96a080c54 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1438,12 +1438,10 @@ The POSTPROC specified there (typically `log-edit') is then called,
  ;; displayed in the wrong minibuffer).
  (cvs-mode!)
  (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup))
-        (lbd list-buffers-directory)
        (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
                      'log-edit)))
    (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist buf)
    (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap)
-    (set (make-local-variable 'list-buffers-directory) lbd)
    (run-hooks 'cvs-mode-commit-hook)))
 (defun cvs-commit-minor-wrap (buf f)
@@ -1494,14 +1492,12 @@ This is best called from a `log-view-mode' buffer."
  ;; displayed in the wrong minibuffer).
  (cvs-mode!)
  (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup))
-        (lbd list-buffers-directory)
        (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
                      'log-edit)))
    (funcall setupfun 'cvs-do-edit-log nil 'cvs-edit-log-filelist buf)
    (when text (erase-buffer) (insert text))
    (set (make-local-variable 'cvs-edit-log-revision) rev)
    (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-edit-log-minor-wrap)
-    (set (make-local-variable 'list-buffers-directory) lbd)
    ;; (run-hooks 'cvs-mode-commit-hook)
    ))
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 28d988961a6..65eea658d4e 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -108,18 +108,23 @@
  :group 'c-macro)
 (defcustom c-macro-preprocessor
-  ;; Cannot rely on standard directory on MS-DOS to find CPP.  In
+  (cond ;; Solaris has it in an unusual place.
-  ;; fact, cannot rely on having cpp.exe, either, in latest GCC
-  ;; versions.
-  (cond ((eq system-type 'ms-dos) "gcc -E -C -o - -")
-        ;; Solaris has it in an unusual place.
        ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)"
                            system-configuration)
              (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp"))
         "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E")
-        ((file-exists-p "/usr/ccs/lib/cpp") "/usr/ccs/lib/cpp -C")
+        ((locate-file "/usr/ccs/lib/cpp"
-        ((memq system-type '(darwin berkeley-unix)) "gcc -E -C -")
+                      '("/") exec-suffixes 'file-executable-p)
-        (t "/lib/cpp -C"))
+         "/usr/ccs/lib/cpp -C")
+        ((locate-file "/lib/cpp"
+                      '("/") exec-suffixes 'file-executable-p)
+         "/lib/cpp -C")
+        ;; On some systems, we cannot rely on standard directories to
+        ;; find CPP.  In fact, we cannot rely on having cpp, either,
+        ;; in some GCC versions.
+        ((locate-file "cpp" exec-path exec-suffixes 'file-executable-p)
+         "cpp -C")
+        (t "gcc -E -C -o - -"))
  "The preprocessor used by the cmacexp package.
 If you change this, be sure to preserve the `-C' (don't strip comments)
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 0cc70386be8..f5180b1fb48 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1247,7 +1247,8 @@ Optional argument MINOR indicates this is called from
  (make-local-variable 'compilation-messages-start)
  (make-local-variable 'compilation-error-screen-columns)
  (make-local-variable 'overlay-arrow-position)
-  (set (make-local-variable 'overlay-arrow-string) "=>")
+  (set (make-local-variable 'overlay-arrow-string)
+       (if (display-graphic-p) "=>" ""))
  (setq next-error-overlay-arrow-position nil)
  (add-hook 'kill-buffer-hook
            (lambda () (setq next-error-overlay-arrow-position nil)) nil t)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 56344a67e5c..c4298ffb99b 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -196,19 +196,20 @@ detailed description of this mode.
  :group 'gud
  :version "22.1")
-(defcustom gdb-cpp-define-alist-program 
+(defcustom gdb-cpp-define-alist-program "gcc -E -dM -"
-  (cond ((eq system-type 'ms-dos) "gcc -E -dM -o - -")
+  "Shell command for generating a list of defined macros in a source file.
-        (t "gcc -E -dM -"))
-  "The program name for generating an alist of #define directives.
 This list is used to display the #define directive associated
 with an identifier as a tooltip. It works in a debug session with
-GDB, when tooltip-gud-tips-p is t."
+GDB, when gud-tooltip-mode is t.
+Set `gdb-cpp-define-alist-flags' for any include paths or
+predefined macros."
  :type 'string
  :group 'gud
  :version "22.1")
 (defcustom gdb-cpp-define-alist-flags ""
-  "*Preprocessor flags used by `gdb-create-define-alist'."
+  "*Preprocessor flags for `gdb-cpp-define-alist-program'."
  :type 'string
  :group 'gud
  :version "22.1")
@@ -233,6 +234,14 @@ GDB, when tooltip-gud-tips-p is t."
      (setq name (nth 1 (split-string define "[( ]")))
      (push (cons name define) gdb-define-alist))))
+(defun gdb-tooltip-print ()
+  (tooltip-show
+   (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
+     (let ((string (buffer-string)))
+       ;; remove newline for gud-tooltip-echo-area
+       (substring string 0 (- (length string) 1))))
+   gud-tooltip-echo-area))
 (defun gdb-set-gud-minor-mode (buffer)
  "Set gud-minor-mode from find-file if appropriate."
  (goto-char (point-min))
@@ -252,9 +261,10 @@ GDB, when tooltip-gud-tips-p is t."
    (with-current-buffer buffer
      (set (make-local-variable 'gud-minor-mode) 'gdba)
      (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
-      (make-local-variable 'gdb-define-alist)
+      (when gud-tooltip-mode
-      (gdb-create-define-alist)
+        (make-local-variable 'gdb-define-alist)
-      (add-hook 'after-save-hook 'gdb-create-define-alist nil t))))
+        (gdb-create-define-alist)
+        (add-hook 'after-save-hook 'gdb-create-define-alist nil t)))))
 (defun gdb-set-gud-minor-mode-existing-buffers ()
  (dolist (buffer (buffer-list))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4f5ffe0d23b..195875842a3 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1,4 +1,4 @@
-;;; grep.el --- run compiler as inferior of Emacs, parse error messages
+;;; grep.el --- run Grep as inferior of Emacs, parse match messages
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 ;;   2001, 2002, 2004, 2005  Free Software Foundation, Inc.
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index e98cb9eee58..544a4804639 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -39,6 +39,8 @@
 ;;; Code:
+(eval-when-compile (require 'cl)) ; for case macro
 (require 'comint)
 (require 'etags)
@@ -113,11 +115,11 @@ Used to grey out relevant togolbar icons.")
 (easy-mmode-defmap gud-menu-map
  '(([help]     "Info" . gud-goto-info)
-    ([tooltips] menu-item "Toggle GUD tooltips" tooltip-toggle-gud-tips
+    ([tooltips] menu-item "Toggle GUD tooltips" gud-tooltip-mode
                  :enable  (and (not emacs-basic-display)
                                (display-graphic-p)
                                (fboundp 'x-show-tip))
-                  :button (:toggle . tooltip-gud-tips-p))
+                  :button (:toggle . gud-tooltip-mode))
    ([refresh]  "Refresh" . gud-refresh)
    ([run]      menu-item "Run" gud-run
                  :enable (and (not gud-running)
@@ -228,7 +230,8 @@ Uses `gud-<MINOR-MODE>-directories' to find the source files."
      (with-current-buffer buf
        (set (make-local-variable 'gud-minor-mode) minor-mode)
        (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
-        (when (memq gud-minor-mode '(gdbmi gdba))
+        (when (and gud-tooltip-mode
+                   (memq gud-minor-mode '(gdbmi gdba)))
          (make-local-variable 'gdb-define-alist)
          (unless  gdb-define-alist (gdb-create-define-alist))
          (add-hook 'after-save-hook 'gdb-create-define-alist nil t))
@@ -3100,6 +3103,204 @@ Treats actions as defuns."
         (font-lock-syntactic-face-function
          . gdb-script-font-lock-syntactic-face))))
+;;; tooltips for GUD
+;;; Customizable settings
+(defcustom gud-tooltip-modes '(gud-mode c-mode c++-mode fortran-mode)
+  "List of modes for which to enable GUD tips."
+  :type 'sexp
+  :tag "GUD modes"
+  :group 'tooltip)
+(defcustom gud-tooltip-display
+  '((eq (tooltip-event-buffer gud-tooltip-event)
+        (marker-buffer gud-overlay-arrow-position)))
+  "List of forms determining where GUD tooltips are displayed.
+Forms in the list are combined with AND.  The default is to display
+only tooltips in the buffer containing the overlay arrow."
+  :type 'sexp
+  :tag "GUD buffers predicate"
+  :group 'tooltip)
+(defcustom gud-tooltip-echo-area nil
+  "Use the echo area instead of frames for GUD tooltips."
+  :type 'boolean
+  :tag "Use echo area"
+  :group 'tooltip)
+(define-obsolete-variable-alias 'tooltip-gud-modes
+                                'gud-tooltip-modes "22.1")
+(define-obsolete-variable-alias 'tooltip-gud-display
+                                'gud-tooltip-display "22.1")
+(define-obsolete-variable-alias 'tooltip-use-echo-area
+                                'gud-tooltip-echo-area "22.1")
+;;; Reacting on mouse movements
+(defun gud-tooltip-change-major-mode ()
+  "Function added to `change-major-mode-hook' when tooltip mode is on."
+  (add-hook 'post-command-hook 'gud-tooltip-activate-mouse-motions-if-enabled))
+(defun gud-tooltip-activate-mouse-motions-if-enabled ()
+  "Reconsider for all buffers whether mouse motion events are desired."
+  (remove-hook 'post-command-hook
+               'gud-tooltip-activate-mouse-motions-if-enabled)
+  (dolist (buffer (buffer-list))
+    (save-excursion
+      (set-buffer buffer)
+      (if (and gud-tooltip-mode
+               (memq major-mode gud-tooltip-modes))
+          (gud-tooltip-activate-mouse-motions t)
+        (gud-tooltip-activate-mouse-motions nil)))))
+(defvar gud-tooltip-mouse-motions-active nil
+  "Locally t in a buffer if tooltip processing of mouse motion is enabled.")
+(defun gud-tooltip-activate-mouse-motions (activatep)
+  "Activate/deactivate mouse motion events for the current buffer.
+ACTIVATEP non-nil means activate mouse motion events."
+  (if activatep
+      (progn
+        (make-local-variable 'gud-tooltip-mouse-motions-active)
+        (setq gud-tooltip-mouse-motions-active t)
+        (make-local-variable 'track-mouse)
+        (setq track-mouse t))
+    (when gud-tooltip-mouse-motions-active
+      (kill-local-variable 'gud-tooltip-mouse-motions-active)
+      (kill-local-variable 'track-mouse))))
+(defun gud-tooltip-mouse-motion (event)
+  "Command handler for mouse movement events in `global-map'."
+  (interactive "e")
+  (tooltip-hide)
+  (when (car (mouse-pixel-position))
+    (setq tooltip-last-mouse-motion-event (copy-sequence event))
+    (tooltip-start-delayed-tip)))
+;;; Tips for `gud'
+(defvar gud-tooltip-original-filter nil
+  "Process filter to restore after GUD output has been received.")
+(defvar gud-tooltip-dereference nil
+  "Non-nil means print expressions with a `*' in front of them.
+For C this would dereference a pointer expression.")
+(defvar gud-tooltip-event nil
+  "The mouse movement event that led to a tooltip display.
+This event can be examined by forms in GUD-TOOLTIP-DISPLAY.")
+(defun gud-tooltip-toggle-dereference ()
+  "Toggle whether tooltips should show `* expr' or `expr'."
+  (interactive)
+  (setq gud-tooltip-dereference (not gud-tooltip-dereference))
+  (when (interactive-p)
+    (message "Dereferencing is now %s."
+             (if gud-tooltip-dereference "on" "off"))))
+(define-obsolete-function-alias 'tooltip-gud-toggle-dereference
+                                'gud-tooltip-toggle-dereference "22.1")
+(define-minor-mode gud-tooltip-mode
+  "Toggle the display of GUD tooltips."
+  :global t
+  :group 'gud
+  (if gud-tooltip-mode
+      (progn
+        (add-hook 'change-major-mode-hook 'gud-tooltip-change-major-mode)
+        (add-hook 'pre-command-hook 'tooltip-hide)
+        (add-hook 'tooltip-hook 'gud-tooltip-tips)
+        (define-key global-map [mouse-movement] 'gud-tooltip-mouse-motion))
+    (unless tooltip-mode (remove-hook 'pre-command-hook 'tooltip-hide)
+    (remove-hook 'change-major-mode-hook 'tooltip-change-major-mode)
+    (remove-hook 'tooltip-hook 'gud-tooltip-tips)
+    (define-key global-map [mouse-movement] 'ignore)))
+  (gud-tooltip-activate-mouse-motions-if-enabled)
+  (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
+      (if gud-tooltip-mode
+          (progn
+            (dolist (buffer (buffer-list))
+              (unless (eq buffer gud-comint-buffer)
+                (with-current-buffer buffer
+                  (when (and (memq gud-minor-mode '(gdbmi gdba))
+                             (not (string-match "\\`\\*.+\\*\\'"
+                                                (buffer-name))))
+                    (make-local-variable 'gdb-define-alist)
+                    (gdb-create-define-alist)
+                    (add-hook 'after-save-hook
+                              'gdb-create-define-alist nil t))))))
+        (kill-local-variable 'gdb-define-alist)
+        (remove-hook 'after-save-hook 'gdb-create-define-alist t))))
+; This will only display data that comes in one chunk.
+; Larger arrays (say 400 elements) are displayed in
+; the tootip incompletely and spill over into the gud buffer.
+; Switching the process-filter creates timing problems and
+; it may be difficult to do better. Using annotations as in
+; gdb-ui.el gets round this problem.
+(defun gud-tooltip-process-output (process output)
+  "Process debugger output and show it in a tooltip window."
+  (set-process-filter process gud-tooltip-original-filter)
+  (tooltip-show (tooltip-strip-prompt process output)
+                gud-tooltip-echo-area))
+(defun gud-tooltip-print-command (expr)
+  "Return a suitable command to print the expression EXPR.
+If GUD-TOOLTIP-DEREFERENCE is t, also prepend a `*' to EXPR."
+  (when gud-tooltip-dereference
+    (setq expr (concat "*" expr)))
+  (case gud-minor-mode
+    ((gdb gdba) (concat "server print " expr))
+    (dbx (concat "print " expr))
+    (xdb (concat "p " expr))
+    (sdb (concat expr "/"))
+    (perldb expr)))
+(defun gud-tooltip-tips (event)
+  "Show tip for identifier or selection under the mouse.
+The mouse must either point at an identifier or inside a selected
+region for the tip window to be shown.  If gud-tooltip-dereference is t,
+add a `*' in front of the printed expression. In the case of a C program
+controlled by GDB, show the associated #define directives when program is
+not executing.
+This function must return nil if it doesn't handle EVENT."
+  (let (process)
+    (when (and (eventp event)
+               gud-tooltip-mode
+               (boundp 'gud-comint-buffer)
+               gud-comint-buffer
+               (buffer-name gud-comint-buffer); gud-comint-buffer might be killed
+               (setq process (get-buffer-process gud-comint-buffer))
+               (posn-point (event-end event))
+               (or (and (eq gud-minor-mode 'gdba) (not gdb-active-process))
+                   (progn (setq gud-tooltip-event event)
+                          (eval (cons 'and gud-tooltip-display)))))
+      (let ((expr (tooltip-expr-to-print event)))
+        (when expr
+          (if (and (eq gud-minor-mode 'gdba)
+                   (not gdb-active-process))
+              (progn
+                (with-current-buffer
+                    (window-buffer (let ((mouse (mouse-position)))
+                                     (window-at (cadr mouse)
+                                                (cddr mouse))))
+                  (let ((define-elt (assoc expr gdb-define-alist)))
+                    (unless (null define-elt)
+                      (tooltip-show (cdr define-elt))
+                      expr))))
+            (let ((cmd (gud-tooltip-print-command expr)))
+              (unless (null cmd) ; CMD can be nil if unknown debugger
+                (if (eq gud-minor-mode 'gdba)
+                    (gdb-enqueue-input
+                     (list  (concat cmd "\n") 'gdb-tooltip-print))
+                  (setq gud-tooltip-original-filter (process-filter process))
+                  (set-process-filter process 'gud-tooltip-process-output)
+                  (gud-basic-call cmd))
+                expr))))))))
 (provide 'gud)
 ;;; arch-tag: 6d990948-df65-461a-be39-1c7fb83ac4c4
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index e3da5508342..8696e1a7d63 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -36,7 +36,7 @@
 ;; information, at:
 ;;
 ;;           http://idlwave.org
-;; 
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -52,10 +52,10 @@
  :group 'idlwave-online-help
  :type 'boolean)
-(defvar idlwave-html-link-sep 
+(defvar idlwave-html-link-sep
  (if idlwave-html-help-pre-v6 "#" "#wp"))
-(defcustom idlwave-html-help-location 
+(defcustom idlwave-html-help-location
  (if (memq system-type '(ms-dos windows-nt))
      nil
    "/usr/local/etc/")
@@ -83,7 +83,7 @@ Defaults to `browse-url-browser-function', which see."
  :group 'idlwave-online-help
  :type 'string)
-(defcustom idlwave-help-browser-generic-args 
+(defcustom idlwave-help-browser-generic-args
  (if (boundp 'browse-url-generic-args)
      browse-url-generic-args "")
  "Program args to use if using browse-url-generic-program."
@@ -191,7 +191,7 @@ support."
 (defvar idlwave-help-activate-links-aggressively nil
  "Obsolete variable.")
-  
 (defvar idlwave-completion-help-info)
 (defvar idlwave-help-frame nil
@@ -314,7 +314,7 @@ It collects and prints the diagnostics messages."
      (setq idlwave-last-context-help-pos marker)
      (idlwave-do-context-help1 arg)
      (if idlwave-help-diagnostics
-          (message "%s" (mapconcat 'identity 
+          (message "%s" (mapconcat 'identity
                                   (nreverse idlwave-help-diagnostics)
                                   "; "))))))
@@ -323,7 +323,7 @@ It collects and prints the diagnostics messages."
 (defun idlwave-do-context-help1 (&optional arg)
  "The work-horse version of `idlwave-context-help', which see."
  (save-excursion
-    (if (equal (char-after) ?/) 
+    (if (equal (char-after) ?/)
        (forward-char 1)
      (if (equal (char-before) ?=)
          (backward-char 1)))
@@ -333,7 +333,7 @@ It collects and prints the diagnostics messages."
           (beg (save-excursion (skip-chars-backward chars) (point)))
           (end (save-excursion (skip-chars-forward chars) (point)))
           (this-word (buffer-substring-no-properties beg end))
-           (st-ass (assoc (downcase this-word) 
+           (st-ass (assoc (downcase this-word)
                          idlwave-help-special-topic-words))
           (classtag (and (string-match "self\\." this-word)
                          (< beg (- end 4))))
@@ -341,7 +341,7 @@ It collects and prints the diagnostics messages."
                           (string-match "\\`\\([^.]+\\)\\." this-word)
                           (< beg (- end 4))))
           module keyword cw mod1 mod2 mod3)
-      (if (or arg 
+      (if (or arg
              (and (not st-ass)
                   (not classtag)
                   (not structtag)
@@ -360,15 +360,15 @@ It collects and prints the diagnostics messages."
                      (setq module (list "init" 'fun (match-string 1 str))
                            idlwave-current-obj_new-class (match-string 1 str))
                    )))))
-      (cond 
+      (cond
       (arg (setq mod1 module))
-       
       ;; A special topic -- only system help
       (st-ass (setq mod1 (list (cdr st-ass))))
-       
       ;; A system variable -- only system help
-       ((string-match 
+       ((string-match
-         "\\`!\\([a-zA-Z0-9_]+\\)\\(\.\\([A-Za-z0-9_]+\\)\\)?" 
+         "\\`!\\([a-zA-Z0-9_]+\\)\\(\.\\([A-Za-z0-9_]+\\)\\)?"
         this-word)
        (let* ((word  (match-string-no-properties 1 this-word))
               (entry (assq (idlwave-sintern-sysvar word)
@@ -380,18 +380,19 @@ It collects and prints the diagnostics messages."
                                      (cdr (assq 'tags entry))))))
               (link (nth 1 (assq 'link entry))))
          (if tag-target
-              (setq link (idlwave-substitute-link-target link 
+              (setq link (idlwave-substitute-link-target link
                                                         tag-target)))
          (setq mod1 (list link))))
-                          
       ;; An executive command -- only system help
       ((string-match "^\\.\\([A-Z_]+\\)" this-word)
        (let* ((word  (match-string 1 this-word))
-               (link  (cdr (assoc-ignore-case 
+               (link  (cdr (assoc-string
                            word
-                            idlwave-executive-commands-alist))))
+                            idlwave-executive-commands-alist
+                            t))))
          (setq mod1 (list link))))
-       
       ;; A class -- system OR in-text help (via class__define).
       ((and (eq cw 'class)
             (or (idlwave-in-quote)  ; e.g. obj_new
@@ -405,28 +406,28 @@ It collects and prints the diagnostics messages."
               (name   (concat (downcase this-word) "__define"))
               (link   (nth 1 (assq 'link entry))))
          (setq mod1 (list link name 'pro))))
-       
       ;; A class structure tag (self.BLAH) -- only in-text help available
       (classtag
        (let ((tag (substring this-word (match-end 0)))
              class-with found-in)
-          (when (setq class-with 
+          (when (setq class-with
                      (idlwave-class-or-superclass-with-tag
                       (nth 2 (idlwave-current-routine))
                       tag))
            (setq found-in (idlwave-class-found-in class-with))
-            (if (assq (idlwave-sintern-class class-with) 
+            (if (assq (idlwave-sintern-class class-with)
                      idlwave-system-class-info)
                (error "No help available for system class tags"))
            (setq idlwave-help-do-class-struct-tag t)
-            (setq mod1 (list nil 
+            (setq mod1 (list nil
                             (if found-in
                                 (cons (concat found-in "__define") class-with)
                               (concat class-with "__define"))
                             'pro
                             nil ; no class.... it's a procedure!
                             tag)))))
-       
       ;; A regular structure tag -- only in text, and if
       ;; optional `complete-structtag' loaded.
       (structtag
@@ -437,7 +438,7 @@ It collects and prints the diagnostics messages."
          (setq idlwave-help-do-struct-tag
                idlwave-structtag-struct-location
                mod1 (list nil nil nil nil tag))))
-       
       ;; A routine keyword -- in text or system help
       ((and (memq cw '(function-keyword procedure-keyword))
             (stringp this-word)
@@ -479,7 +480,7 @@ It collects and prints the diagnostics messages."
               (setq mod1 (append (list t) module (list keyword))
                     mod2 (list t this-word 'fun nil)
                     mod3 (append (list t) module)))))
-       
       ;; Everything else
       (t
        (setq mod1 (append (list t) module))))
@@ -512,14 +513,14 @@ Needs additional info stored in global `idlwave-completion-help-info'."
         word link)
    (mouse-set-point ev)
-          
    ;; See if we can also find help somewhere, e.g. for multiple classes
    (setq word (idlwave-this-word))
    (if (string= word "")
        (error "No help item selected"))
    (setq link (get-text-property 0 'link word))
    (select-window cw)
-    (cond 
+    (cond
     ;; Routine name
     ((memq what '(procedure function routine))
      (setq name word)
@@ -530,9 +531,9 @@ Needs additional info stored in global `idlwave-completion-help-info'."
                           type)))
            (setq link t)               ; No specific link valid yet
            (if sclasses
-                (setq classes (idlwave-members-only 
+                (setq classes (idlwave-members-only
                               classes (cons class sclasses))))
-            (setq class (idlwave-popup-select ev classes 
+            (setq class (idlwave-popup-select ev classes
                                              "Select Class" 'sort))))
      ;; XXX is this necessary, given all-method-classes?
@@ -552,7 +553,7 @@ Needs additional info stored in global `idlwave-completion-help-info'."
                           type)))
            (setq link t) ; Link can't be correct yet
            (if sclasses
-                (setq classes (idlwave-members-only 
+                (setq classes (idlwave-members-only
                               classes (cons class sclasses))))
            (setq class (idlwave-popup-select ev classes
                                              "Select Class" 'sort))
@@ -564,14 +565,14 @@ Needs additional info stored in global `idlwave-completion-help-info'."
        (if (string= (downcase name) "obj_new")
            (setq class idlwave-current-obj_new-class
                  name "Init"))))
-          
     ;; Class name
     ((eq what 'class)
      (setq class word
            word nil))
-     
     ;; A special named function to call which sets some of our variables
-     ((and (symbolp what) 
+     ((and (symbolp what)
           (fboundp what))
      (funcall what 'set word))
@@ -586,7 +587,7 @@ Needs additional info stored in global `idlwave-completion-help-info'."
  "Highlight all completions for which help is available and attach link.
 Those words in `idlwave-completion-help-links' have links.  The
 `idlwave-help-link-face' face is used for this."
-  (if idlwave-highlight-help-links-in-completion      
+  (if idlwave-highlight-help-links-in-completion
      (with-current-buffer (get-buffer "*Completions*")
        (save-excursion
          (let* ((case-fold-search t)
@@ -602,13 +603,13 @@ Those words in `idlwave-completion-help-links' have links.  The
              (setq beg (match-beginning 1) end (match-end 1)
                    word (match-string 1) doit nil)
              ;; Call special completion function test
-              (if (and (symbolp what) 
+              (if (and (symbolp what)
                       (fboundp what))
                  (setq doit (funcall what 'test word))
                ;; Look for special link property passed in help-links
                (if idlwave-completion-help-links
-                    (setq doit (assoc-ignore-case 
+                    (setq doit (assoc-string
-                                word idlwave-completion-help-links))))
+                                word idlwave-completion-help-links t))))
              (when doit
                (if (consp doit)
                    (setq props (append props `(link ,(cdr doit)))))
@@ -633,13 +634,13 @@ Those words in `idlwave-completion-help-links' have links.  The
             ;; Try to select the return frame.
             ;; This can crash on slow network connections, obviously when
             ;; we kill the help frame before the return-frame is selected.
-             ;; To protect the workings, we wait for up to one second 
+             ;; To protect the workings, we wait for up to one second
             ;; and check if the return-frame *is* now selected.
             ;; This is marked "eperimental" since we are not sure when its OK.
             (let ((maxtime 1.0) (time 0.) (step 0.1))
               (select-frame idlwave-help-return-frame)
               (while (and (sit-for step)
-                           (not (eq (selected-frame) 
+                           (not (eq (selected-frame)
                                    idlwave-help-return-frame))
                           (< (setq time (+ time step)) maxtime)))))
         (delete-frame idlwave-help-frame))
@@ -652,7 +653,7 @@ Those words in `idlwave-completion-help-links' have links.  The
 (defvar default-toolbar-visible-p)
 (defun idlwave-help-display-help-window (&optional pos-or-func)
-  "Display the help window.  
+  "Display the help window.
 Move window start to POS-OR-FUNC, if passed as a position, or call it
 if passed as a function.  See `idlwave-help-use-dedicated-frame'."
  (let ((cw (selected-window))
@@ -663,13 +664,13 @@ if passed as a function.  See `idlwave-help-use-dedicated-frame'."
          (switch-to-buffer buf))
      ;; Do it in this frame and save the window configuration
      (if (not (get-buffer-window buf nil))
-          (setq idlwave-help-window-configuration 
+          (setq idlwave-help-window-configuration
                (current-window-configuration)))
      (display-buffer buf nil (selected-frame))
      (select-window (get-buffer-window buf)))
    (raise-frame)
-    (if pos-or-func 
+    (if pos-or-func
-        (if (functionp pos-or-func) 
+        (if (functionp pos-or-func)
            (funcall pos-or-func)
          (goto-char pos-or-func)
          (recenter 0)))
@@ -691,31 +692,31 @@ if passed as a function.  See `idlwave-help-use-dedicated-frame'."
      (select-frame idlwave-help-return-frame)))
 (defun idlwave-online-help (link &optional name type class keyword)
-  "Display HTML or other special help on a certain topic.  
+  "Display HTML or other special help on a certain topic.
 Either loads an HTML link, if LINK is non-nil, or gets special-help on
 the optional arguments, if any special help is defined.  If LINK is
 `t', first look up the optional arguments in the routine info list to
 see if a link is set for it.  Try extra help functions if necessary."
  ;; Lookup link
-  (if (eq link t) 
+  (if (eq link t)
-      (let ((entry (idlwave-best-rinfo-assoc name type class 
+      (let ((entry (idlwave-best-rinfo-assoc name type class
                                             (idlwave-routines) nil t)))
        (cond
         ;; Try keyword link
-         ((and keyword 
+         ((and keyword
               (setq link (cdr (idlwave-entry-find-keyword entry keyword)))))
         ;; Default, regular entry link
         (t (setq link (idlwave-entry-has-help entry))))))
  (cond
   ;; An explicit link
-   ((stringp link) 
+   ((stringp link)
    (idlwave-help-html-link link))
-   
   ;; Any extra help
   (idlwave-extra-help-function
    (idlwave-help-get-special-help name type class keyword))
-   
   ;; Nothing worked
   (t (idlwave-help-error name type class keyword))))
@@ -726,7 +727,7 @@ see if a link is set for it.  Try extra help functions if necessary."
         (help-pos (save-excursion
                     (set-buffer (idlwave-help-get-help-buffer))
                     (let ((buffer-read-only nil))
-                       (funcall idlwave-extra-help-function 
+                       (funcall idlwave-extra-help-function
                                name type class keyword)))))
    (if help-pos
        (idlwave-help-display-help-window help-pos)
@@ -740,7 +741,7 @@ see if a link is set for it.  Try extra help functions if necessary."
        (browse-url-generic-program idlwave-help-browser-generic-program)
        ;(browse-url-generic-args idlwave-help-browser-generic-args)
        full-link)
-    
    (if (and (memq system-type '(ms-dos windows-nt))
             idlwave-help-use-hh)
        (progn
@@ -755,12 +756,12 @@ see if a link is set for it.  Try extra help functions if necessary."
      ;; Just a regular file name (+ anchor name)
      (unless (and (stringp help-loc)
                   (file-directory-p help-loc))
-        (error 
+        (error
         "Invalid help location; customize `idlwave-html-help-location'."))
-      (setq full-link (concat 
+      (setq full-link (concat
                       "file://"
-                       (expand-file-name 
+                       (expand-file-name
-                        link 
+                        link
                        (expand-file-name "idl_html_help" help-loc)))))
    ;; Check for a local browser
@@ -796,7 +797,7 @@ This function can be used as `idlwave-extra-help-function'."
    (if class-only   ;Help with class?  Using "Init" as source.
        (setq name "Init"
              type 'fun))
-    (if (not struct-tag) 
+    (if (not struct-tag)
        (setq file
              (idlwave-routine-source-file
               (nth 3 (idlwave-best-rinfo-assoc
@@ -809,7 +810,7 @@ This function can be used as `idlwave-extra-help-function'."
    (if (or struct-tag (stringp file))
        (progn
          (setq in-buf ; structure-tag completion is always in current buffer
-                (if struct-tag 
+                (if struct-tag
                    idlwave-current-tags-buffer
                  (idlwave-get-buffer-visiting file)))
          ;; see if file is in a visited buffer, insert those contents
@@ -831,19 +832,19 @@ This function can be used as `idlwave-extra-help-function'."
    ;; Try to find a good place to display
    (setq def-pos
          ;; Find the class structure tag if that's what we're after
-          (cond 
+          (cond
           ;; Class structure tags: find the class or named structure
           ;; definition
           (class-struct-tag
-            (save-excursion 
+            (save-excursion
              (setq class
-                    (if (string-match "[a-zA-Z0-9]\\(__\\)" name) 
+                    (if (string-match "[a-zA-Z0-9]\\(__\\)" name)
                        (substring name 0 (match-beginning 1))
                      idlwave-current-tags-class))
              (and
               (idlwave-find-class-definition class nil real-class)
               (idlwave-find-struct-tag keyword))))
-           
           ;; Generic structure tags: the structure definition
           ;; location within the file has been recorded in
           ;; `struct-tag'
@@ -853,14 +854,14 @@ This function can be used as `idlwave-extra-help-function'."
               (integerp struct-tag)
               (goto-char struct-tag)
               (idlwave-find-struct-tag keyword))))
-           
           ;; Just find the routine definition
           (t
            (if class-only (point-min)
              (idlwave-help-find-routine-definition name type class keyword))))
          idlwave-help-def-pos def-pos)
-    (if (and idlwave-help-source-try-header 
+    (if (and idlwave-help-source-try-header
             (not (or struct-tag class-struct-tag)))
        ;; Check if we can find the header
        (save-excursion
@@ -870,7 +871,7 @@ This function can be used as `idlwave-extra-help-function'."
                idlwave-help-in-header header-pos)))
    (if (or header-pos def-pos)
-        (progn 
+        (progn
          (if (boundp 'idlwave-help-min-frame-width)
              (setq idlwave-help-min-frame-width 80))
          (goto-char (or header-pos def-pos)))
@@ -884,7 +885,7 @@ This function can be used as `idlwave-extra-help-function'."
 KEYWORD is ignored. Returns the point of match if successful, nil otherwise."
  (save-excursion
    (goto-char (point-max))
-    (if (re-search-backward 
+    (if (re-search-backward
         (concat "^[ \t]*"
                 (if (eq type 'pro) "pro"
                   (if (eq type 'fun) "function"
@@ -930,22 +931,22 @@ with spaces allowed between the keyword and the following dash or equal sign.
 If there is a match, we assume it is the keyword description."
  (let* ((case-fold-search t)
         (rname (if (stringp class)
-                    (concat 
+                    (concat
                     "\\("
                     ;; Traditional name or class::name
                     "\\("
                     "\\(" (regexp-quote (downcase class)) "::\\)?"
                     (regexp-quote (downcase name))
                     "\\>\\)"
-                     (concat 
+                     (concat
                      "\\|"
                      ;; class__define or just class
                      (regexp-quote (downcase class)) "\\(__define\\)?")
                     "\\)")
                  (regexp-quote (downcase name))))
-         
         ;; NAME tag plus the routine name.  The new version is from JD.
-         (name-re (concat 
+         (name-re (concat
                   "\\(^;+\\*?[ \t]*"
                   idlwave-help-doclib-name
                   "\\([ \t]*:\\|[ \t]*$\\)[ \t]*\\(\n;+[ \t]*\\)*"
@@ -980,7 +981,7 @@ If there is a match, we assume it is the keyword description."
                       (regexp-quote (upcase keyword))
                      "\\>")))
         dstart dend name-pos kwds-pos kwd-pos)
-    (catch 'exit 
+    (catch 'exit
      (save-excursion
        (goto-char (point-min))
        (while (and (setq dstart (re-search-forward idlwave-doclib-start nil t))
@@ -988,7 +989,7 @@ If there is a match, we assume it is the keyword description."
          ;; found a routine header
          (goto-char dstart)
          (if (setq name-pos (re-search-forward name-re dend t))
-              (progn 
+              (progn
                (if keyword
                    ;; We do need a keyword
                    (progn
@@ -1070,7 +1071,7 @@ When DING is non-nil, ring the bell as well."
      (idlwave-help-find-first-header nil)
    (setq idlwave-help-in-header nil)
    (idlwave-help-toggle-header-match-and-def arg 'top)))
-  
 (defun idlwave-help-toggle-header-match-and-def (arg &optional top)
  (interactive "P")
  (let ((args idlwave-help-args)
@@ -1082,7 +1083,7 @@ When DING is non-nil, ring the bell as well."
          (setq pos idlwave-help-def-pos))
      ;; Try to display header
      (setq pos (apply 'idlwave-help-find-in-doc-header
-                       (if top 
+                       (if top
                           (list (car args) (nth 1 args) (nth 2 args) nil)
                         args)))
      (if pos
@@ -1116,7 +1117,7 @@ Useful when source code is displayed as help.  See the option
              (font-lock-fontify-buffer))
          (set-syntax-table syntax-table)))))
-      
 (defun idlwave-help-error (name type class keyword)
  (error "Can't find help on %s%s %s"
         (or (and (or class name) (idlwave-make-full-name class name))
diff --git a/lisp/replace.el b/lisp/replace.el
index dc8eb131b72..1cef7ecc52a 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -977,32 +977,33 @@ See also `multi-occur'."
    (setq occur-buf (get-buffer-create buf-name))
    (with-current-buffer occur-buf
-      (setq buffer-read-only nil)
      (occur-mode)
-      (erase-buffer)
+      (let ((inhibit-read-only t))
-      (let ((count (occur-engine
+        (erase-buffer)
-                    regexp active-bufs occur-buf
+        (let ((count (occur-engine
-                    (or nlines list-matching-lines-default-context-lines)
+                      regexp active-bufs occur-buf
-                    (and case-fold-search
+                      (or nlines list-matching-lines-default-context-lines)
-                         (isearch-no-upper-case-p regexp t))
+                      (and case-fold-search
-                    list-matching-lines-buffer-name-face
+                           (isearch-no-upper-case-p regexp t))
-                    nil list-matching-lines-face t)))
+                      list-matching-lines-buffer-name-face
-        (let* ((bufcount (length active-bufs))
+                      nil list-matching-lines-face t)))
-               (diff (- (length bufs) bufcount)))
+          (let* ((bufcount (length active-bufs))
-          (message "Searched %d buffer%s%s; %s match%s for `%s'"
+                 (diff (- (length bufs) bufcount)))
-                   bufcount (if (= bufcount 1) "" "s")
+            (message "Searched %d buffer%s%s; %s match%s for `%s'"
-                   (if (zerop diff) "" (format " (%d killed)" diff))
+                     bufcount (if (= bufcount 1) "" "s")
-                   (if (zerop count) "no" (format "%d" count))
+                     (if (zerop diff) "" (format " (%d killed)" diff))
-                   (if (= count 1) "" "es")
+                     (if (zerop count) "no" (format "%d" count))
-                   regexp))
+                     (if (= count 1) "" "es")
-        (setq occur-revert-arguments (list regexp nlines bufs)
+                     regexp))
-              buffer-read-only t)
+          (setq occur-revert-arguments (list regexp nlines bufs))
-        (if (> count 0)
+          (if (> count 0)
-            (progn
+              (progn
-              (display-buffer occur-buf)
+                (display-buffer occur-buf)
-              (setq next-error-last-buffer occur-buf))
+                (setq next-error-last-buffer occur-buf))
-          (kill-buffer occur-buf)))
+            (kill-buffer occur-buf)))
-      (run-hooks 'occur-hook))))
+        (run-hooks 'occur-hook))
+      (setq buffer-read-only t)
+      (set-buffer-modified-p nil))))
 (defun occur-engine-add-prefix (lines)
  (mapcar
@@ -1013,7 +1014,6 @@ See also `multi-occur'."
 (defun occur-engine (regexp buffers out-buf nlines case-fold-search
                            title-face prefix-face match-face keep-props)
  (with-current-buffer out-buf
-    (setq buffer-read-only nil)
    (let ((globalcount 0)
          (coding nil))
      ;; Map over all the buffers
diff --git a/lisp/simple.el b/lisp/simple.el
index cfbd6d4155f..8c73c005e69 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -113,9 +113,7 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
 (defvar next-error-highlight-timer nil)
 (defvar next-error-overlay-arrow-position nil)
-;; This is nil so as not to really display anything on text
+(put 'next-error-overlay-arrow-position 'overlay-arrow-string "=>")
-;; terminals.  On text terminals, it would hide part of the file name.
-(put 'next-error-overlay-arrow-position 'overlay-arrow-string "")
 (add-to-list 'overlay-arrow-variable-list 'next-error-overlay-arrow-position)
 (defvar next-error-last-buffer nil
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 9519dadeed5..64623e76ce9 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1168,7 +1168,8 @@ This is in addition to the primary selection."
 (defun x-select-text (text &optional push)
  (x-set-selection 'PRIMARY text)
  (setq x-last-selected-text-primary text)
-  (when x-select-enable-clipboard
+  (if (not x-select-enable-clipboard)
+      (setq x-last-selected-text-clipboard nil)
    (x-set-selection 'CLIPBOARD text)
    (setq x-last-selected-text-clipboard text))
  )
@@ -1203,20 +1204,26 @@ in `selection-converter-alist', which see."
                 (setq data
                       (decode-coding-string data 'utf-16)))))
            ((eq data-type 'com.apple.traditional-mac-plain-text)
-             (setq data (decode-coding-string data coding))))
+             (setq data (decode-coding-string data coding)))
+            ((eq data-type 'public.file-url)
+             (setq data (decode-coding-string data 'utf-8))
+             ;; Remove a trailing nul character.
+             (let ((len (length data)))
+               (if (and (> len 0) (= (aref data (1- len)) ?\0))
+                   (setq data (substring data 0 (1- len)))))))
      (put-text-property 0 (length data) 'foreign-selection data-type data))
    data))
 (defun x-selection-value (type)
-  (let (text tiff-image)
+  (let ((data-types '(public.utf16-plain-text
-    (setq text (condition-case nil
+                      com.apple.traditional-mac-plain-text
-                   (x-get-selection type 'public.utf16-plain-text)
+                      public.file-url))
-                 (error nil)))
+        text tiff-image)
-    (if (not text)
+    (while (and (null text) data-types)
-        (setq text (condition-case nil
+      (setq text (condition-case nil
-                       (x-get-selection type
+                     (x-get-selection type (car data-types))
-                                        'com.apple.traditional-mac-plain-text)
+                   (error nil)))
-                     (error nil))))
+      (setq data-types (cdr data-types)))
    (if text
        (remove-text-properties 0 (length text) '(foreign-selection nil) text))
    (setq tiff-image (condition-case nil
@@ -1237,7 +1244,8 @@ in `selection-converter-alist', which see."
 ;;; selection won't be added to the kill ring over and over.
 (defun x-get-selection-value ()
  (let (clip-text primary-text)
-    (when x-select-enable-clipboard
+    (if (not x-select-enable-clipboard)
+        (setq x-last-selected-text-clipboard nil)
      (setq clip-text (x-selection-value 'CLIPBOARD))
      (if (string= clip-text "") (setq clip-text nil))
@@ -1286,11 +1294,14 @@ in `selection-converter-alist', which see."
    ))
 (put 'CLIPBOARD 'mac-scrap-name "com.apple.scrap.clipboard")
-(if (eq system-type 'darwin)
+(when (eq system-type 'darwin)
-    (put 'FIND 'mac-scrap-name "com.apple.scrap.find"))
+  (put 'FIND 'mac-scrap-name "com.apple.scrap.find")
+  (put 'PRIMARY 'mac-scrap-name
+       (format "org.gnu.Emacs.%d.selection.PRIMARY" (emacs-pid))))
 (put 'com.apple.traditional-mac-plain-text 'mac-ostype "TEXT")
 (put 'public.utf16-plain-text 'mac-ostype "utxt")
 (put 'public.tiff 'mac-ostype "TIFF")
+(put 'public.file-url 'mac-ostype "furl")
 (defun mac-select-convert-to-string (selection type value)
  (let ((str (cdr (xselect-convert-to-string selection nil value)))
@@ -1326,6 +1337,16 @@ in `selection-converter-alist', which see."
      (setq next-selection-coding-system nil)
      (cons type str))))
+(defun mac-select-convert-to-file-url (selection type value)
+  (let ((filename (xselect-convert-to-filename selection type value))
+        (coding (or file-name-coding-system default-file-name-coding-system)))
+    (if (and filename coding)
+        (setq filename (encode-coding-string filename coding)))
+    (and filename
+         (concat "file://localhost"
+                 (mapconcat 'url-hexify-string
+                            (split-string filename "/") "/")))))
 (setq selection-converter-alist
      (nconc
       '((public.utf16-plain-text . mac-select-convert-to-string)
@@ -1333,6 +1354,7 @@ in `selection-converter-alist', which see."
         ;; This is not enabled by default because the `Import Image'
         ;; menu makes Emacs crash or hang for unknown reasons.
         ;; (public.tiff . nil)
+         (public.file-url . mac-select-convert-to-file-url)
         )
       selection-converter-alist))
@@ -1702,6 +1724,7 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 (setq interprogram-cut-function 'x-select-text)
 (setq interprogram-paste-function 'x-get-selection-value)
+(defalias 'x-cut-buffer-or-selection-value 'x-get-selection-value)
 ;;; Turn off window-splitting optimization; Mac is usually fast enough
 ;;; that this is only annoying.
@@ -1756,7 +1779,9 @@ Switch to a buffer editing the last file dropped."
          '(lambda ()
             (defvar mac-ready-for-drag-n-drop t)))
-;;;; Scroll bars
+;;;; Non-toolkit Scroll bars
+(unless x-toolkit-scroll-bars
 ;; for debugging
 ;; (defun mac-handle-scroll-bar-event (event) (interactive "e") (princ event))
@@ -1816,6 +1841,7 @@ Switch to a buffer editing the last file dropped."
    (mac-scroll-ignore-events)
    (scroll-up 1)))
+)
 ;;;; Others
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 97bc3350b47..c8926776400 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -301,7 +301,9 @@ Must be greater than 1."
  :type 'integer
  :group 'ispell)
-(defcustom ispell-program-name "ispell"
+(defcustom ispell-program-name
+  (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
+      "ispell")
  "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
  :type 'string
  :group 'ispell)
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index a4ec5d3ac8b..c2e58d7d582 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -80,14 +80,15 @@ Do so according to FILENAME's declared charset."
            assoc)
       (list (cond
              ((setq assoc
-                     (assoc-ignore-case charset
+                     (assoc-string charset
-                                        po-content-type-charset-alist))
+                                   po-content-type-charset-alist
+                                   t))
               (cdr assoc))
-              ((or (setq assoc (assoc-ignore-case charset coding-system-alist))
+              ((or (setq assoc (assoc-string charset coding-system-alist t))
                   (setq assoc
-                         (assoc-ignore-case (subst-char-in-string ?_ ?-
+                         (assoc-string (subst-char-in-string ?_ ?-
-                                                                  charset)
+                                                             charset)
-                                            coding-system-alist)))
+                                       coding-system-alist t)))
               (intern (car assoc)))
              ;; In principle we should also check the `mime-charset'
              ;; property of everything in the base coding system
@@ -101,10 +102,10 @@ Do so according to FILENAME's declared charset."
               ;; to require it initially?
               (require 'code-pages nil t)
               (if (or
-                    (setq assoc (assoc-ignore-case charset coding-system-alist))
+                    (setq assoc (assoc-string charset coding-system-alist t))
-                    (setq assoc (assoc-ignore-case (subst-char-in-string
+                    (setq assoc (assoc-string (subst-char-in-string
-                                                    ?_ ?- charset)
+                                               ?_ ?- charset)
-                                                   coding-system-alist)))
+                                              coding-system-alist t)))
                   (intern (car assoc))
                 'raw-text))))))))
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 9bd35f05d11..7a2865b9dfa 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -27,9 +27,6 @@
 ;;; Code:
-(eval-when-compile (require 'cl)) ; for case macro
 ;;; Customizable settings
 (defgroup tooltip nil
@@ -116,42 +113,6 @@ position to pop up the tooltip."
  "Face for tooltips."
  :group 'tooltip)
-(defcustom tooltip-gud-tips-p nil
-  "*Non-nil means show tooltips in GUD sessions.
-This allows you to display a variable's value in a tooltip simply
-by pointing at it with the mouse.  In the case of a C program
-controlled by GDB, it shows the associated #define directives
-when program is not executing."
-  :type 'boolean
-  :tag "GUD"
-  :group 'tooltip)
-(defcustom tooltip-gud-modes '(gud-mode c-mode c++-mode fortran-mode)
-  "List of modes for which to enable GUD tips."
-  :type 'sexp
-  :tag "GUD modes"
-  :group 'tooltip)
-(defcustom tooltip-gud-display
-  '((eq (tooltip-event-buffer tooltip-gud-event)
-        (marker-buffer gud-overlay-arrow-position)))
-  "List of forms determining where GUD tooltips are displayed.
-Forms in the list are combined with AND.  The default is to display
-only tooltips in the buffer containing the overlay arrow."
-  :type 'sexp
-  :tag "GUD buffers predicate"
-  :group 'tooltip)
-(defcustom tooltip-gud-echo-area nil
-  "Use the echo area instead of frames for GUD tooltips."
-  :type 'boolean
-  :tag "Use echo area"
-  :group 'tooltip)
-(defvaralias 'tooltip-use-echo-area 'tooltip-gud-echo-area)
-(make-obsolete-variable 'tooltip-use-echo-area 'tooltip-gud-echo-area "22.1")
 ;;; Variables that are not customizable.
@@ -169,7 +130,6 @@ the last mouse movement event that occurred.")
 (defvar tooltip-hide-time nil
  "Time when the last tooltip was hidden.")
 ;;; Event accessors
 (defun tooltip-event-buffer (event)
@@ -178,7 +138,6 @@ This might return nil if the event did not occur over a buffer."
  (let ((window (posn-window (event-end event))))
    (and window (window-buffer window))))
 ;;; Switching tooltips on/off
 ;; We don't set track-mouse globally because this is a big redisplay
@@ -202,16 +161,15 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
  :group 'tooltip
  (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
    (error "Sorry, tooltips are not yet available on this system"))
-  (let ((hook-fn (if tooltip-mode 'add-hook 'remove-hook)))
+  (if tooltip-mode
-    (funcall hook-fn 'change-major-mode-hook 'tooltip-change-major-mode)
+      (progn
-    (tooltip-activate-mouse-motions-if-enabled)
+        (add-hook 'pre-command-hook 'tooltip-hide)
-    (funcall hook-fn 'pre-command-hook 'tooltip-hide)
+        (add-hook 'tooltip-hook 'tooltip-help-tips))
-    (funcall hook-fn 'tooltip-hook 'tooltip-gud-tips)
+    (unless (and (boundp 'gud-tooltip-mode) gud-tooltip-mode)
-    (funcall hook-fn 'tooltip-hook 'tooltip-help-tips)
+      (remove-hook 'pre-command-hook 'tooltip-hide))
-    (setq show-help-function (if tooltip-mode 'tooltip-show-help-function nil))
+    (remove-hook 'tooltip-hook 'tooltip-help-tips))
-    ;; `ignore' is the default binding for mouse movements.
+  (setq show-help-function
-    (define-key global-map [mouse-movement]
+        (if tooltip-mode 'tooltip-show-help-function nil)))
-      (if tooltip-mode 'tooltip-mouse-motion 'ignore))))
 ;;; Timeout for tooltip display
@@ -242,49 +200,6 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
                                    tooltip-last-mouse-motion-event))
-;;; Reacting on mouse movements
-(defun tooltip-change-major-mode ()
-  "Function added to `change-major-mode-hook' when tooltip mode is on."
-  (add-hook 'post-command-hook 'tooltip-activate-mouse-motions-if-enabled))
-(defun tooltip-activate-mouse-motions-if-enabled ()
-  "Reconsider for all buffers whether mouse motion events are desired."
-  (remove-hook 'post-command-hook 'tooltip-activate-mouse-motions-if-enabled)
-  (dolist (buffer (buffer-list))
-    (save-excursion
-      (set-buffer buffer)
-      (if (and tooltip-mode
-               tooltip-gud-tips-p
-               (memq major-mode tooltip-gud-modes))
-          (tooltip-activate-mouse-motions t)
-        (tooltip-activate-mouse-motions nil)))))
-(defvar tooltip-mouse-motions-active nil
-  "Locally t in a buffer if tooltip processing of mouse motion is enabled.")
-(defun tooltip-activate-mouse-motions (activatep)
-  "Activate/deactivate mouse motion events for the current buffer.
-ACTIVATEP non-nil means activate mouse motion events."
-  (if activatep
-      (progn
-        (make-local-variable 'tooltip-mouse-motions-active)
-        (setq tooltip-mouse-motions-active t)
-        (make-local-variable 'track-mouse)
-        (setq track-mouse t))
-    (when tooltip-mouse-motions-active
-      (kill-local-variable 'tooltip-mouse-motions-active)
-      (kill-local-variable 'track-mouse))))
-(defun tooltip-mouse-motion (event)
-  "Command handler for mouse movement events in `global-map'."
-  (interactive "e")
-  (tooltip-hide)
-  (when (car (mouse-pixel-position))
-    (setq tooltip-last-mouse-motion-event (copy-sequence event))
-    (tooltip-start-delayed-tip)))
 ;;; Displaying tips
 (defun tooltip-set-param (alist key value)
@@ -396,114 +311,6 @@ of PROCESS."
    output))
-;;; Tips for `gud'
-(defvar tooltip-gud-original-filter nil
-  "Process filter to restore after GUD output has been received.")
-(defvar tooltip-gud-dereference nil
-  "Non-nil means print expressions with a `*' in front of them.
-For C this would dereference a pointer expression.")
-(defvar tooltip-gud-event nil
-  "The mouse movement event that led to a tooltip display.
-This event can be examined by forms in TOOLTIP-GUD-DISPLAY.")
-(defun tooltip-gud-toggle-dereference ()
-  "Toggle whether tooltips should show `* expr' or `expr'."
-  (interactive)
-  (setq tooltip-gud-dereference (not tooltip-gud-dereference))
-  (when (interactive-p)
-    (message "Dereferencing is now %s."
-             (if tooltip-gud-dereference "on" "off"))))
-(defun tooltip-toggle-gud-tips ()
-  "Toggle the display of GUD tooltips."
-  (interactive)
-  (setq tooltip-gud-tips-p (not tooltip-gud-tips-p))
-  ;; Reconsider for all buffers whether mouse motion events are desired.
-  (tooltip-change-major-mode)
-  (when (interactive-p)
-    (message (format "GUD tooltips %sabled"
-                     (if tooltip-gud-tips-p "en" "dis")))))
-; This will only display data that comes in one chunk.
-; Larger arrays (say 400 elements) are displayed in
-; the tootip incompletely and spill over into the gud buffer.
-; Switching the process-filter creates timing problems and
-; it may be difficult to do better. Using annotations as in
-; gdb-ui.el gets round this problem.
-(defun tooltip-gud-process-output (process output)
-  "Process debugger output and show it in a tooltip window."
-  (set-process-filter process tooltip-gud-original-filter)
-  (tooltip-show (tooltip-strip-prompt process output)
-                tooltip-gud-echo-area))
-(defun tooltip-gud-print-command (expr)
-  "Return a suitable command to print the expression EXPR.
-If TOOLTIP-GUD-DEREFERENCE is t, also prepend a `*' to EXPR."
-  (when tooltip-gud-dereference
-    (setq expr (concat "*" expr)))
-  (case gud-minor-mode
-    ((gdb gdba) (concat "server print " expr))
-    (dbx (concat "print " expr))
-    (xdb (concat "p " expr))
-    (sdb (concat expr "/"))
-    (perldb expr)))
-(defun tooltip-gud-tips (event)
-  "Show tip for identifier or selection under the mouse.
-The mouse must either point at an identifier or inside a selected
-region for the tip window to be shown.  If tooltip-gud-dereference is t,
-add a `*' in front of the printed expression. In the case of a C program
-controlled by GDB, show the associated #define directives when program is
-not executing.
-This function must return nil if it doesn't handle EVENT."
-  (let (process)
-    (when (and (eventp event)
-               tooltip-gud-tips-p
-               (boundp 'gud-comint-buffer)
-               gud-comint-buffer
-               (buffer-name gud-comint-buffer); gud-comint-buffer might be killed
-               (setq process (get-buffer-process gud-comint-buffer))
-               (posn-point (event-end event))
-               (or (eq gud-minor-mode 'gdba)
-                   (progn (setq tooltip-gud-event event)
-                          (eval (cons 'and tooltip-gud-display)))))
-      (let ((expr (tooltip-expr-to-print event)))
-        (when expr
-          (if (and (eq gud-minor-mode 'gdba)
-                   (not gdb-active-process))
-              (progn
-                (with-current-buffer
-                    (window-buffer (let ((mouse (mouse-position)))
-                                     (window-at (cadr mouse)
-                                                (cddr mouse))))
-                  (let ((define-elt (assoc expr gdb-define-alist)))
-                    (unless (null define-elt)
-                      (tooltip-show (cdr define-elt))
-                      expr))))
-            (let ((cmd (tooltip-gud-print-command expr)))
-              (unless (null cmd) ; CMD can be nil if unknown debugger
-                (case gud-minor-mode
-                  (gdba (gdb-enqueue-input
-                         (list  (concat cmd "\n") 'gdb-tooltip-print)))
-                  (t
-                   (setq tooltip-gud-original-filter (process-filter process))
-                   (set-process-filter process 'tooltip-gud-process-output)
-                  (gud-basic-call cmd)))
-                expr))))))))
-(defun gdb-tooltip-print ()
-  (tooltip-show
-   (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
-     (let ((string (buffer-string)))
-       ;; remove newline for tooltip-gud-echo-area
-       (substring string 0 (- (length string) 1))))
-   tooltip-gud-echo-area))
 ;;; Tooltip help.
 (defvar tooltip-help-message nil
author	Karoly Lorentey	2005-05-09 16:13:15 +0000
committer	Karoly Lorentey	2005-05-09 16:13:15 +0000
commit	85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd (patch)
tree	85aebc58216ed19de18354b3d9974942eea621d5 /lisp
parent	c25b55138a36cf5f334070baf79ce61c1e956eed (diff)
parent	c7bda15b58de3efcf856786167f11f5b4175e30b (diff)
download	emacs-85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd.tar.gz emacs-85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd.zip