(icomplete-simple-completing-p, icomplete-completions):

[gnu-emacs] / lisp / enriched.el

diff --git a/lisp/enriched.el b/lisp/enriched.el
index 003516d4e95b65e12548600d35c02ffe0c7ef135..b0618b3571c4e56a904c8d63df4c54b49fa48552 100644 (file)
--- a/lisp/enriched.el
+++ b/lisp/enriched.el
@@ -1,7 +1,7 @@
-;;; 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
+;; Copyright (c) 1994, 1995 Free Software Foundation, Inc.
 
-;; Author: Boris Goldowsky <boris@cs.rochester.edu>
+;; Author: Boris Goldowsky <boris@gnu.ai.mit.edu>
 ;; Keywords: wp, faces
 
 ;; This file is part of GNU Emacs.
@@ -79,7 +79,7 @@ stored in the file.")
     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)))
@@ -209,21 +209,23 @@ Commands:
                   (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)))
+                  (setq default-text-properties
+                        (plist-put default-text-properties
+                                   'front-sticky sticky))))
             (run-hooks 'enriched-mode-hooks)))
     (set-buffer-modified-p mod)
     (force-mode-line-update)))
@@ -413,7 +415,7 @@ One annotation each for foreground color, background color, italic, etc."
 
 (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))