[Emacs-diffs] Changes to emacs/lisp/enriched.el

[Pavel Janík]

Index: emacs/lisp/enriched.el
diff -c emacs/lisp/enriched.el:1.35 emacs/lisp/enriched.el:1.36
*** emacs/lisp/enriched.el:1.35 Mon Dec 31 15:23:56 2001
--- emacs/lisp/enriched.el      Mon Dec 31 19:49:56 2001
***************
*** 117,123 ****
                   (right       "flushright")
                   (left        "flushleft")
                   (full        "flushboth")
!                  (center      "center")) 
      (PARAMETER     (t           "param")) ; Argument of preceding annotation
      ;; The following are not part of the standard:
      (FUNCTION      (enriched-decode-foreground "x-color")
--- 117,123 ----
                   (right       "flushright")
                   (left        "flushleft")
                   (full        "flushboth")
!                  (center      "center"))
      (PARAMETER     (t           "param")) ; Argument of preceding annotation
      ;; The following are not part of the standard:
      (FUNCTION      (enriched-decode-foreground "x-color")
***************
*** 167,173 ****
  text/enriched format.
  Turning the mode on runs `enriched-mode-hook'.
  
! More information about Enriched mode is available in the file 
  etc/enriched.doc in the Emacs distribution directory.
  
  Commands:
--- 167,173 ----
  text/enriched format.
  Turning the mode on runs `enriched-mode-hook'.
  
! More information about Enriched mode is available in the file
  etc/enriched.doc in the Emacs distribution directory.
  
  Commands:
***************
*** 180,186 ****
         ;; restore old variable values
         (while enriched-old-bindings
           (set (pop enriched-old-bindings) (pop enriched-old-bindings))))
!         
        ((memq 'text/enriched buffer-file-format)
         ;; Mode already on; do nothing.
         nil)
--- 180,186 ----
         ;; restore old variable values
         (while enriched-old-bindings
           (set (pop enriched-old-bindings) (pop enriched-old-bindings))))
! 
        ((memq 'text/enriched buffer-file-format)
         ;; Mode already on; do nothing.
         nil)
***************
*** 288,294 ****
      (unjustify-region)
      (goto-char from)
      (format-replace-strings '(("<" . "<<")))
!     (format-insert-annotations 
       (format-annotate-region from (point-max) enriched-translations
                             'enriched-make-annotation enriched-ignore))
      (goto-char from)
--- 288,294 ----
      (unjustify-region)
      (goto-char from)
      (format-replace-strings '(("<" . "<<")))
!     (format-insert-annotations
       (format-annotate-region from (point-max) enriched-translations
                             'enriched-make-annotation enriched-ignore))
      (goto-char from)
***************
*** 330,336 ****
  One annotation each for foreground color, background color, italic, etc."
    (cons (and old (enriched-face-ans old))
        (and new (enriched-face-ans new))))
!           
  (defun enriched-face-ans (face)
    "Return annotations specifying FACE.
  FACE may be a list of faces instead of a single face;
--- 330,336 ----
  One annotation each for foreground color, background color, italic, etc."
    (cons (and old (enriched-face-ans old))
        (and new (enriched-face-ans new))))
! 
  (defun enriched-face-ans (face)
    "Return annotations specifying FACE.
  FACE may be a list of faces instead of a single face;
***************
*** 407,418 ****
        (delete-char 1)
        ;; A single < that does not start an annotation is an error,
        ;; which we note and then ignore.
!       (message "Warning: malformed annotation in file at %s" 
               (1- (point)))))
    (if (not (eobp))
        (let* ((beg (match-beginning 0))
             (end (match-end 0))
!            (name (downcase (buffer-substring 
                              (match-beginning 2) (match-end 2))))
             (pos (not (match-beginning 1))))
        (list beg end name pos))))
--- 407,418 ----
        (delete-char 1)
        ;; A single < that does not start an annotation is an error,
        ;; which we note and then ignore.
!       (message "Warning: malformed annotation in file at %s"
               (1- (point)))))
    (if (not (eobp))
        (let* ((beg (match-beginning 0))
             (end (match-end 0))
!            (name (downcase (buffer-substring
                              (match-beginning 2) (match-end 2))))
             (pos (not (match-beginning 1))))
        (list beg end name pos))))
***************
*** 481,486 ****
      (unless prop
        (message "Warning: invalid <x-display> parameter %s" param))
      (list start end 'display prop)))
!              
!          
  ;;; enriched.el ends here
--- 481,485 ----
      (unless prop
        (message "Warning: invalid <x-display> parameter %s" param))
      (list start end 'display prop)))
! 
  ;;; enriched.el ends here