-;;; enriched.el -- read and save files in text/enriched format
-;; Copyright (c) 1994 Free Software Foundation
+;;; enriched.el --- read and save files in text/enriched format
-;; Author: Boris Goldowsky <boris@cs.rochester.edu>
+;; Copyright (c) 1994, 1995 Free Software Foundation, Inc.
+
+;; Author: Boris Goldowsky <boris@gnu.ai.mit.edu>
;; Keywords: wp, faces
;; This file is part of GNU Emacs.
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
-;;
+
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
-;;
+
;; This file implements reading, editing, and saving files with
-;; text-properties such as faces, levels of indentation, and true line breaks
-;; distinguished from newlines just used to fit text into the window.
-;;
+;; text-properties such as faces, levels of indentation, and true line
+;; breaks distinguished from newlines just used to fit text into the window.
+
;; The file format used is the MIME text/enriched format, which is a
-;; standard format defined in internet RFC 1563. All standard annotations are
-;; supported except for <smaller> and <bigger>, which are currently not
+;; standard format defined in internet RFC 1563. All standard annotations
+;; are supported except for <smaller> and <bigger>, which are currently not
;; possible to display.
-;;
+
;; A separate file, enriched.doc, 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.
+;; 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.
+
+;;; Code:
(provide 'enriched)
(if window-system (require 'facemenu))
nil
(make-face 'excerpt)
(if window-system
- (make-face-italic 'excerpt)))
+ (make-face-italic 'excerpt nil t)))
(defconst enriched-display-table (or (copy-sequence standard-display-table)
(make-display-table)))
;;; Internal variables
(defvar enriched-mode nil
- "True if `enriched-mode' is in use.")
+ "True if Enriched mode is in use.")
(make-variable-buffer-local 'enriched-mode)
(if (not (assq 'enriched-mode minor-mode-alist))
(cons '(enriched-mode " Enriched")
minor-mode-alist)))
-(defvar enriched-mode-hooks nil
- "Functions to run when entering `enriched-mode'.
+(defvar enriched-mode-hook nil
+ "Functions to run when entering Enriched mode.
If you set variables in this hook, you should arrange for them to be restored
-to their old values if enriched-mode is left. One way to do this is to add
+to their old values if you leave Enriched mode. One way to do this is to add
them and their old values to `enriched-old-bindings'.")
(defvar enriched-old-bindings nil
"Minor mode for editing text/enriched files.
These are files with embedded formatting information in the MIME standard
text/enriched format.
-Turning the mode on runs `enriched-mode-hooks'.
+Turning the mode on runs `enriched-mode-hook'.
-More information about enriched-mode is available in the file
+More information about Enriched mode is available in the file
etc/enriched.doc in the Emacs distribution directory.
Commands:
(setq buffer-file-format
(cons 'text/enriched buffer-file-format)))
;; Save old variable values before we change them.
- ;; These will be restored if we exit enriched-mode.
+ ;; These will be restored if we exit Enriched mode.
(setq enriched-old-bindings
(list 'buffer-display-table buffer-display-table
'indent-line-function indent-line-function
'use-hard-newlines use-hard-newlines
- 'default-properties default-properties))
+ 'default-text-properties default-text-properties))
(make-local-variable 'indent-line-function)
(make-local-variable 'use-hard-newlines)
- (make-local-variable 'default-properties)
+ (make-local-variable 'default-text-properties)
(setq indent-line-function 'indent-to-left-margin
buffer-display-table enriched-display-table
use-hard-newlines t)
- (let ((sticky (get-text-property-default 'front-sticky))
+ (let ((sticky (plist-get default-text-properties 'front-sticky))
(p enriched-par-props))
(while p
(if (not (memq (car p) sticky))
(setq sticky (cons (car p) sticky)))
(setq p (cdr p)))
(if sticky
- (put-text-property-default 'front-sticky sticky)))
- (run-hooks 'enriched-mode-hooks)))
+ (setq default-text-properties
+ (plist-put default-text-properties
+ 'front-sticky sticky))))
+ (run-hooks 'enriched-mode-hook)))
(set-buffer-modified-p mod)
(force-mode-line-update)))
;;;
(defvar enriched-mode-map nil
- "Keymap for `enriched-mode'.")
+ "Keymap for Enriched mode.")
(if (null enriched-mode-map)
(fset 'enriched-mode-map (setq enriched-mode-map (make-sparse-keymap))))
(defun enriched-next-annotation ()
"Find and return next text/enriched annotation.
-Any \"<<\" strings encountered are coverted to \"<\".
+Any \"<<\" strings encountered are converted to \"<\".
Return value is \(begin end name positive-p), or nil if none was found."
(while (and (search-forward "<" nil 1)
(progn (goto-char (match-beginning 0))
(delete-char 1)
;; A single < that does not start an annotation is an error,
;; which we note and then ignore.
- (message (format "Warning: malformed annotation in file at %s"
- (1- (point))))))
+ (message "Warning: malformed annotation in file at %s"
+ (1- (point)))))
(if (not (eobp))
(let* ((beg (match-beginning 0))
(end (match-end 0))