# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1176657936 0
# Node ID 1110109db29c33d5bc5b777495847501ce0575f3
# Parent  e4b92c62b1a90586b645e28d57581291b7da872b
Revert last change.

diff -r e4b92c62b1a9 -r 1110109db29c lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Apr 15 17:21:32 2007 +0000
+++ b/lisp/ChangeLog	Sun Apr 15 17:25:36 2007 +0000
@@ -1,13 +1,3 @@
-2007-04-15  Chong Yidong  <cyd@stupidchicken.com>
-
-	* mail/footnote.el (footnote-current-style): New var.
-	(Footnote-index-to-string, Footnote-current-regexp)
-	(Footnote-cycle-style, Footnote-set-style): Use it instead of
-	footnote-style.
-	(footnote-mode): Make footnote-current style buffer-local instead
-	of footnote-style, and initialize it to footnote-style.
-	(footnote-style): Update docstring.
-
 2007-04-15  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
 	* textmodes/bibtex.el (bibtex-field-list): Use functionp.
diff -r e4b92c62b1a9 -r 1110109db29c lisp/mail/footnote.el
--- a/lisp/mail/footnote.el	Sun Apr 15 17:21:32 2007 +0000
+++ b/lisp/mail/footnote.el	Sun Apr 15 17:25:36 2007 +0000
@@ -294,7 +294,7 @@
 exciting styles.")
 
 (defcustom footnote-style 'numeric
-  "*Default style used for footnoting.
+  "*Style used for footnoting.
 numeric == 1, 2, 3, ...
 english-lower == a, b, c, ...
 english-upper == A, B, C, ...
@@ -306,10 +306,6 @@
 			      footnote-style-alist))
   :group 'footnote)
 
-(defvar footnote-current-style
-  "Style used for footnoting in the current buffer.
-The possible values are the same as in `footnote-style'.")
-
 ;;; Style utilities & functions
 (defun Footnote-style-p (style)
   "Return non-nil if style is a valid style known to footnote-mode."
@@ -318,14 +314,14 @@
 (defun Footnote-index-to-string (index)
   "Convert a binary index into a string to display as a footnote.
 Conversion is done based upon the current selected style."
-  (let ((alist (if (Footnote-style-p footnote-current-style)
-		   (assq footnote-current-style footnote-style-alist)
+  (let ((alist (if (Footnote-style-p footnote-style)
+		   (assq footnote-style footnote-style-alist)
 		 (nth 0 footnote-style-alist))))
     (funcall (nth 1 alist) index)))
 
 (defun Footnote-current-regexp ()
   "Return the regexp of the index of the current style."
-  (concat (nth 2 (or (assq footnote-current-style footnote-style-alist)
+  (concat (nth 2 (or (assq footnote-style footnote-style-alist)
 		     (nth 0 footnote-style-alist))) "*"))
 
 (defun Footnote-refresh-footnotes (&optional index-regexp)
@@ -382,13 +378,13 @@
 (defun Footnote-cycle-style ()
   "Select next defined footnote style."
   (interactive)
-  (let ((old (Footnote-assoc-index footnote-current-style footnote-style-alist))
+  (let ((old (Footnote-assoc-index footnote-style footnote-style-alist))
 	(max (length footnote-style-alist))
 	idx)
     (setq idx (1+ old))
     (when (>= idx max)
       (setq idx 0))
-    (setq footnote-current-style (car (nth idx footnote-style-alist)))
+    (setq footnote-style (car (nth idx footnote-style-alist)))
     (Footnote-refresh-footnotes (nth 2 (nth old footnote-style-alist)))))
 
 (defun Footnote-set-style (&optional style)
@@ -397,7 +393,7 @@
    (list (intern (completing-read
 		  "Footnote Style: "
 		  obarray #'Footnote-style-p 'require-match))))
-  (setq footnote-current-style style))
+  (setq footnote-style style))
 
 ;; Internal functions
 (defun Footnote-insert-numbered-footnote (arg &optional mousable)
@@ -737,7 +733,7 @@
 	  (> (prefix-numeric-value arg) 0)))
   (when footnote-mode
     ;; (Footnote-setup-keybindings)
-    (set (make-local-variable 'footnote-current-style) footnote-style)
+    (make-local-variable 'footnote-style)
     (if (fboundp 'force-mode-line-update)
 	(force-mode-line-update)
       (set-buffer-modified-p (buffer-modified-p)))