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

[Stefan Monnier]

Index: emacs/lisp/savehist.el
diff -c emacs/lisp/savehist.el:1.10 emacs/lisp/savehist.el:1.11
*** emacs/lisp/savehist.el:1.10 Tue Nov  1 06:09:32 2005
--- emacs/lisp/savehist.el      Mon Nov 14 22:30:35 2005
***************
*** 4,10 ****
  
  ;; Author: Hrvoje Niksic <address@hidden>
  ;; Keywords: minibuffer
! ;; Version: 19
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Hrvoje Niksic <address@hidden>
  ;; Keywords: minibuffer
! ;; Version: 23
  
  ;; This file is part of GNU Emacs.
  
***************
*** 64,72 ****
  Set this by calling the `savehist-mode' function or using the customize
  interface."
    :type 'boolean
!   :set (if (fboundp 'custom-set-minor-mode)
!            'custom-set-minor-mode
!          (lambda (symbol value) (funcall symbol (or value 0))))
    :initialize 'custom-initialize-default
    :require 'savehist
    :group 'savehist)
--- 64,70 ----
  Set this by calling the `savehist-mode' function or using the customize
  interface."
    :type 'boolean
!   :set (lambda (symbol value) (savehist-mode (or value 0)))
    :initialize 'custom-initialize-default
    :require 'savehist
    :group 'savehist)
***************
*** 135,146 ****
  save."
    :type 'hook)
  
! (defvar savehist-coding-system
!   ;; UTF-8 is usually preferable to ISO-2022-8 when available, but under
!   ;; XEmacs, UTF-8 is provided by external packages, and may not always be
!   ;; available, so even if it currently is available, we prefer not to
!   ;; use is.
!   (if (featurep 'xemacs) 'iso-2022-8 'utf-8)
    "The coding system savehist uses for saving the minibuffer history.
  Changing this value while Emacs is running is supported, but considered
  unwise, unless you know what you are doing.")
--- 133,146 ----
  save."
    :type 'hook)
  
! ;; This should be capable of representing characters used by Emacs.
! ;; We prefer UTF-8 over ISO 2022 because it is well-known outside
! ;; Mule.  XEmacs prir to 21.5 had UTF-8 provided by an external
! ;; package which may not be loaded, which is why we check for version.
! (defvar savehist-coding-system (if (and (featurep 'xemacs)
!                                       (<= emacs-major-version 21)
!                                       (< emacs-minor-version 5))
!                                  'iso-2022-8 'utf-8)
    "The coding system savehist uses for saving the minibuffer history.
  Changing this value while Emacs is running is supported, but considered
  unwise, unless you know what you are doing.")
***************
*** 157,177 ****
  along with minibuffer history.  You can change its value off
  `savehist-save-hook' to influence which variables are saved.")
  
! (defconst savehist-no-conversion (if (featurep 'xemacs) 'binary 
'no-conversion)
!   "Coding system without conversion, used for calculating internal checksums.
! Should be as fast as possible, ideally simply exposing the internal
! representation of buffer text.")
! 
! (defvar savehist-loaded nil
!   "Whether the history has already been loaded.
! This prevents toggling `savehist-mode' from destroying existing
! minibuffer history.")
! 
! (eval-when-compile
!   (when (featurep 'xemacs)
!     ;; Must declare this under XEmacs, which doesn't have built-in
!     ;; minibuffer history truncation.
!     (defvar history-length 100)))
  
  ;; Functions.
  
--- 157,175 ----
  along with minibuffer history.  You can change its value off
  `savehist-save-hook' to influence which variables are saved.")
  
! ;; Coding system without any conversion, used for calculating an
! ;; internal checksum.  Should be as fast as possible, ideally simply
! ;; exposing the internal representation of buffer text.
! (defconst savehist-no-conversion (if (featurep 'xemacs) 'binary 
'no-conversion))
! 
! ;; Whether the history has already been loaded.  This prevents
! ;; toggling savehist-mode from destroying existing minibuffer history.
! (defvar savehist-loaded nil)
! 
! (when (featurep 'xemacs)
!   ;; Must declare this under XEmacs, which doesn't have built-in
!   ;; minibuffer history truncation.
!   (defvar history-length 100))
  
  ;; Functions.
  
***************
*** 210,224 ****
         (savehist-uninstall)
         (signal (car errvar) (cdr errvar)))))
      (savehist-install))
- 
-   ;; End with the usual minor-mode conventions normally provided
-   ;; transparently by define-minor-mode.
-   (run-hooks 'savehist-mode-hook)
-   (if (interactive-p)
-       (progn
-         (customize-mark-as-set 'savehist-mode)
-         (unless (current-message)
-           (message "Savehist mode %sabled" (if savehist-mode "en" "dis")))))
    ;; Return the new setting.
    savehist-mode)
  (add-minor-mode 'savehist-mode "")
--- 208,213 ----
***************
*** 373,380 ****
        (error nil))))))
  
  (defun savehist-minibuffer-hook ()
!   (add-to-list 'savehist-minibuffer-history-variables
!              minibuffer-history-variable))
  
  (provide 'savehist)
  
--- 362,372 ----
        (error nil))))))
  
  (defun savehist-minibuffer-hook ()
!   ;; XEmacs sets minibuffer-history-variable to t to mean "no history
!   ;; is being recorded".
!   (unless (eq minibuffer-history-variable t)
!     (add-to-list 'savehist-minibuffer-history-variables
!                minibuffer-history-variable)))
  
  (provide 'savehist)