emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/textmodes/enriched.el [emacs-unicode-2]
Date: Sat, 25 Sep 2004 08:28:46 -0400

Index: emacs/lisp/textmodes/enriched.el
diff -c emacs/lisp/textmodes/enriched.el:1.2.2.3 
emacs/lisp/textmodes/enriched.el:1.2.2.4
*** emacs/lisp/textmodes/enriched.el:1.2.2.3    Tue Sep 21 09:34:11 2004
--- emacs/lisp/textmodes/enriched.el    Sat Sep 25 12:05:36 2004
***************
*** 154,159 ****
--- 154,165 ----
  The value is a list of \(VAR VALUE VAR VALUE...).")
  (make-variable-buffer-local 'enriched-old-bindings)
  
+ ;; The next variable is buffer local if and only if Enriched mode is
+ ;; enabled.  The buffer local value records whether
+ ;; `default-text-properties' should remain buffer local when disabling
+ ;; Enriched mode.  For technical reasons, the default value should be t.
+ (defvar enriched-default-text-properties-local-flag t)
+ 
  ;; Technical internal variable.  Bound to t if `enriched-mode' is
  ;; being rerun by a major mode to allow it to restore buffer-local
  ;; variables and to correctly update `enriched-old-bindings'.
***************
*** 169,175 ****
    "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-hook'.
  
  More information about Enriched mode is available in the file
  etc/enriched.doc in the Emacs distribution directory.
--- 175,181 ----
    "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 or off runs `enriched-mode-hook'.
  
  More information about Enriched mode is available in the file
  etc/enriched.doc in the Emacs distribution directory.
***************
*** 183,189 ****
         (setq buffer-file-format (delq 'text/enriched buffer-file-format))
         ;; restore old variable values
         (while enriched-old-bindings
!          (set (pop enriched-old-bindings) (pop enriched-old-bindings))))
  
        ((and (memq 'text/enriched buffer-file-format)
              (not enriched-rerun-flag))
--- 189,199 ----
         (setq buffer-file-format (delq 'text/enriched buffer-file-format))
         ;; restore old variable values
         (while enriched-old-bindings
!          (set (pop enriched-old-bindings) (pop enriched-old-bindings)))
!        (unless enriched-default-text-properties-local-flag
!          (kill-local-variable 'default-text-properties))
!        (kill-local-variable 'enriched-default-text-properties-local-flag)
!        (unless use-hard-newlines (use-hard-newlines 0)))
  
        ((and (memq 'text/enriched buffer-file-format)
              (not enriched-rerun-flag))
***************
*** 196,202 ****
         ;; These will be restored if we exit Enriched mode.
         (setq enriched-old-bindings
               (list 'buffer-display-table buffer-display-table
!                    'default-text-properties default-text-properties))
         (make-local-variable 'default-text-properties)
         (setq buffer-display-table  enriched-display-table)
         (use-hard-newlines 1 (if enriched-rerun-flag 'never nil))
--- 206,216 ----
         ;; These will be restored if we exit Enriched mode.
         (setq enriched-old-bindings
               (list 'buffer-display-table buffer-display-table
!                    'default-text-properties default-text-properties
!                    'use-hard-newlines use-hard-newlines))
!        (make-local-variable 'enriched-default-text-properties-local-flag)
!        (setq enriched-default-text-properties-local-flag
!              (local-variable-p 'default-text-properties))
         (make-local-variable 'default-text-properties)
         (setq buffer-display-table  enriched-display-table)
         (use-hard-newlines 1 (if enriched-rerun-flag 'never nil))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]