diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-11-22 18:21:51 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-11-22 18:21:51 -0800 |
| commit | 92f78ea3d1a1c1368bc419bcd57d6ad0472d99b9 (patch) | |
| tree | d39e6ec6958f2b8eca2c8c2d0041332241e3794e /lisp | |
| parent | 17e0445be4a6a4f437f4be4924074c90d6477481 (diff) | |
| download | emacs-92f78ea3d1a1c1368bc419bcd57d6ad0472d99b9.tar.gz | |
* etc/enriched.txt: Rename from enriched.doc.
Misc small updates for this hardly being "new" any more.
* lisp/textmodes/enriched.el (enriched-mode): Doc fix.
* lisp/emacs-lisp/authors.el (authors-renamed-files-alist):
Add enriched.doc -> enriched.txt.
Fixes: debbugs:15947
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/authors.el | 1 | ||||
| -rw-r--r-- | lisp/textmodes/enriched.el | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97f4c007c72..30b62f0880f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-11-23 Glenn Morris <rgm@gnu.org> + * textmodes/enriched.el (enriched-mode): Doc fix. + * emacs-lisp/authors.el (authors-renamed-files-alist): + Add enriched.doc -> enriched.txt. + * Makefile.in (emacs): Empty EMACSLOADPATH rather than unsetting. 2013-11-22 Leo Liu <sdl.web@gmail.com> diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 92796ac4e99..abb34d80348 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -617,6 +617,7 @@ in the repository.") ("config.h.in" . "config.in") ("paths.h-dist" . "paths.h.in") ("patch1" . "sed1.inp") + ("enriched.doc" . "enriched.txt") ("GETTING.GNU.SOFTWARE" . "FTP") ("etc/MACHINES" . "MACHINES") ("ONEWS" . "NEWS.19") diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el index e22ad24ccae..82faf883b77 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -31,7 +31,7 @@ ;; are supported except for <smaller> and <bigger>, which are currently not ;; possible to display. -;; A separate file, enriched.doc, contains further documentation and other +;; A separate file, enriched.txt, contains further documentation and other ;; important information about this code. It also serves as an example ;; file in text/enriched format. It should be in the etc directory of your ;; emacs distribution. @@ -199,7 +199,7 @@ if ARG is omitted or nil. Turning the mode on or off runs `enriched-mode-hook'. More information about Enriched mode is available in the file -etc/enriched.doc in the Emacs distribution directory. +\"enriched.txt\" in `data-directory'. Commands: |