diff options
| author | Miles Bader <[email protected]> | 2007-08-03 05:49:59 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-08-03 05:49:59 +0000 |
| commit | 0896d93184a719bc994a3e699de27190aac0acb1 (patch) | |
| tree | 1bd6a3e4b44323c46e4a679adb4bbd3b0b8b3c93 /lisp/startup.el | |
| parent | 84d04702f47babb6e1323acc6c1bd4c761b53231 (diff) | |
| parent | 5716cebdd05ad26a4c3aa57c8ebf2890d4b937f6 (diff) | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 84-87)
- Update from CVS
- Change capitalization of VC backend names for new backends
2007-08-02 Richard M. Stallman <[email protected]>
* lisp/mail/rmailsum.el (rmail-make-summary-line): Find end of msg number
to update deleted flag.
* lisp/cus-edit.el (customize-apropos, customize-apropos-options)
(customize-apropos-faces, customize-apropos-groups): Improve prompt.
* lisp/menu-bar.el (menu-bar-help-menu): Add "About GNU" menu item.
* lisp/startup.el (fancy-splash-head, startup-echo-area-message):
Change message text.
* lisp/emulation/tpu-edt.el (next-line-internal): Setting deleted.
All callers use line-move.
* lisp/progmodes/compile.el (compilation-find-buffer): Return current
buffer immediately if suitable.
(compile, compilation-buffer-name, compilation-start): Doc fixes.
2007-07-31 Daiki Ueno <[email protected]>
* lisp/faces.el (face-normalize-spec): New function.
(frame-set-background-mode): Normalize face-spec before calling
face-spec-match-p.
2007-07-31 Stefan Monnier <[email protected]>
* lisp/server.el (server-window): Add switch-to-buffer-other-frame option.
2007-08-03 Richard M. Stallman <[email protected]>
* src/fileio.c (Fvisited_file_modtime): Use make_time.
Revision: [email protected]/emacs--devo--0--patch-844
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 184a242475..db39e6dcd7 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1678,9 +1678,9 @@ Type \\[describe-distribution] for information on getting the latest version.")) (defun startup-echo-area-message () (if (eq (key-binding "\C-h\C-p") 'describe-project) - "For information about the GNU Project and its goals, type C-h C-p." + "For information about the GNU system and GNU/Linux, type C-h C-p." (substitute-command-keys - "For information about the GNU Project and its goals, type \ + "For information about the GNU system and GNU/Linux, type \ \\[describe-project]."))) |