From 92f78ea3d1a1c1368bc419bcd57d6ad0472d99b9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 22 Nov 2013 18:21:51 -0800 Subject: [PATCH] * 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 --- doc/emacs/text.texi | 4 +-- etc/ChangeLog | 5 ++++ etc/{enriched.doc => enriched.txt} | 40 +++++++++--------------------- lisp/ChangeLog | 4 +++ lisp/emacs-lisp/authors.el | 1 + lisp/textmodes/enriched.el | 4 +-- 6 files changed, 26 insertions(+), 32 deletions(-) rename etc/{enriched.doc => enriched.txt} (88%) diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index b2cb5ee3d3..e45189ba1d 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -2011,8 +2011,8 @@ highlighting (@pxref{Font Lock}). Unlike Enriched mode, Font Lock mode assigns text properties automatically, based on the current buffer contents; those properties are not saved to disk. - The file @file{etc/enriched.doc} in the Emacs distribution serves as -an example of the features of Enriched mode. + The file @file{enriched.txt} in Emacs's @code{data-directory} +serves as an example of the features of Enriched mode. @menu * Enriched Mode:: Entering and exiting Enriched mode. diff --git a/etc/ChangeLog b/etc/ChangeLog index faa369c40f..9a585c6d3c 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2013-11-23 Glenn Morris + + * enriched.txt: Rename from enriched.doc. (Bug#15947) + Misc small updates for this hardly being "new" any more. + 2013-11-20 Leo Liu * NEWS: Mention new display action alist entry `no-display-ok'. diff --git a/etc/enriched.doc b/etc/enriched.txt similarity index 88% rename from etc/enriched.doc rename to etc/enriched.txt index c501fe6b34..21d8481dce 100644 --- a/etc/enriched.doc +++ b/etc/enriched.txt @@ -10,10 +10,10 @@ Text-Width: 70 -Emacs now has the ability to edit enriched text, which is text -containing faces, colors, indentation, and other properties. This -document is a quick introduction to some of the new features, and -is also an example file in the text/enriched format. +Emacs has the ability to edit enriched text, which is text +containing faces, colors, indentation, and other properties. +This document is a quick introduction to some of the features, +and is also an example file in the text/enriched format. bluewhiteINSTALLATION and STARTUP @@ -175,16 +175,8 @@ all of the features of your document, but they will get as close as possible. -The MIME standard is defined in Internet RFC 1521; text/enriched -is defined in RFC 1563. Details on obtaining these documents via -FTP or email may be obtained by sending an email message to -rfc-info@isi.edu with the message body: - - -help: ways_to_get_rfcs - - -See also the newsgroup comp.mail.mime. +The text/enriched standard is defined in Internet RFC 1896 +(<). bluewhiteCUSTOMIZATION @@ -198,16 +190,15 @@ enriched-verbose. - You can add annotations for your own text properties by making additions to enriched-translations. Note that the standard requires you to name your annotation starting "x-" (as in -"x-read-only"). Please send me any such additions that you -think might be of general interest so that I can include them -in the distribution. +"x-read-only"). Please report any such additions that you +think might be of general interest using M-x report-emacs-bug. -bluewhiteTO-DO LIST +bluewhiteTODO LIST -[Feel free to work on these and send me the results!] +[Feel free to work on these and send us the results!] + Conform to updated text/enriched spec in RFC 1896. @@ -238,22 +229,15 @@ it. + Support more formats: RTF, HTML... -+ Use Emacs 21 display features. ++ Use modern Emacs display features. -bluewhiteFinal Notes: - - -This code and documentation is under development. Comments and -bug reports are welcome. +bluewhiteOriginal Author: whiteblueBoris Goldowskylight blue light blue<blue -bluewhiteApril 1995; updated August 1997 - - Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97f4c007c7..30b62f0880 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-11-23 Glenn Morris + * 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 diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 92796ac4e9..abb34d8034 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 e22ad24cca..82faf883b7 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -31,7 +31,7 @@ ;; are supported except for and , 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: -- 2.39.2