Commits

viteno  committed 2e39030

Sync savehist with upstream.

  • Participants
  • Parent commits 3386330

Comments (0)

Files changed (2)

 2005-11-14  Norbert Koch  <viteno@xemacs.org>
 
+	* savehist.el: Sync with upstream version 23.
+
 	* Makefile (VERSION): XEmacs package 2.28 released.
 
 2005-11-02  Norbert Koch  <viteno@xemacs.org>
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Keywords: minibuffer
-;; Version: 22
+;; Version: 23
 
 ;; This file is part of GNU Emacs.
 
 ;; 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))
+					(<= 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
 	(error nil))))))
 
 (defun savehist-minibuffer-hook ()
-  (add-to-list 'savehist-minibuffer-history-variables
-	       minibuffer-history-variable))
+  ;; 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)