aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-12-15 16:45:55 +0000
committerJuanma Barranquero2008-12-15 16:45:55 +0000
commitaf09cfd7a9ef909a4970ae84cabcd0b2ba8d1695 (patch)
tree395da72a18298270d5e1994b359be8fd311c9ab7
parent2364df5cff35f460f385889cc1ad6cf3141bb520 (diff)
downloademacs-af09cfd7a9ef909a4970ae84cabcd0b2ba8d1695.tar.gz
emacs-af09cfd7a9ef909a4970ae84cabcd0b2ba8d1695.zip
* face-remap.el (text-scale-mode-step, buffer-face-mode-face):
* icomplete.el (icomplete-prospects-height): * textmodes/bibtex.el (bibtex-cite-matcher-alist): Add :version tags.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/face-remap.el6
-rw-r--r--lisp/icomplete.el3
-rw-r--r--lisp/textmodes/bibtex.el3
4 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63a5e921326..722ff6b63bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12008-12-15 Juanma Barranquero <lekktu@gmail.com> 12008-12-15 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * face-remap.el (text-scale-mode-step, buffer-face-mode-face):
4 * icomplete.el (icomplete-prospects-height):
5 * textmodes/bibtex.el (bibtex-cite-matcher-alist): Add :version tags.
6
72008-12-15 Juanma Barranquero <lekktu@gmail.com>
8
3 * international/mule.el (find-auto-coding): Fix typo in docstring. 9 * international/mule.el (find-auto-coding): Fix typo in docstring.
4 10
5 * international/mule-cmds.el (select-safe-coding-system): 11 * international/mule-cmds.el (select-safe-coding-system):
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index f87a86c70a0..2e5da9ba16d 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -188,7 +188,8 @@ not inherit from the global definition of FACE."
188 "Scale factor used by `text-scale-mode'. 188 "Scale factor used by `text-scale-mode'.
189Each positive or negative step scales the default face height by this amount." 189Each positive or negative step scales the default face height by this amount."
190 :group 'display 190 :group 'display
191 :type 'number) 191 :type 'number
192 :version "23.1")
192 193
193;; current remapping cookie for text-scale-mode 194;; current remapping cookie for text-scale-mode
194(defvar text-scale-mode-remapping nil) 195(defvar text-scale-mode-remapping nil)
@@ -310,7 +311,8 @@ a top-level keymap, `text-scale-increase' or
310It may contain any value suitable for a `face' text property, 311It may contain any value suitable for a `face' text property,
311including a face name, a list of face names, a face-attribute 312including a face name, a list of face names, a face-attribute
312plist, etc." 313plist, etc."
313 :group 'display) 314 :group 'display
315 :version "23.1")
314 316
315;; current remapping cookie for buffer-face-mode 317;; current remapping cookie for buffer-face-mode
316(defvar buffer-face-mode-remapping nil) 318(defvar buffer-face-mode-remapping nil)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 7f395019825..8afb95fb65d 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -78,7 +78,8 @@
78 (+ 1 (/ (+ icomplete-prospects-length 20) (window-width))) 78 (+ 1 (/ (+ icomplete-prospects-length 20) (window-width)))
79 "Maximum number of lines to use in the minibuffer." 79 "Maximum number of lines to use in the minibuffer."
80 :type 'integer 80 :type 'integer
81 :group 'icomplete) 81 :group 'icomplete
82 :version "23.1")
82 83
83(defcustom icomplete-compute-delay .3 84(defcustom icomplete-compute-delay .3
84 "Completions-computation stall, used only with large-number completions. 85 "Completions-computation stall, used only with large-number completions.
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index e5e3f4d7693..f3932f4f9b4 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -948,7 +948,8 @@ Case is significant.
948Used by `bibtex-search-crossref' and for font-locking." 948Used by `bibtex-search-crossref' and for font-locking."
949 :group 'bibtex 949 :group 'bibtex
950 :type '(repeat (cons (regexp :tag "Regexp") 950 :type '(repeat (cons (regexp :tag "Regexp")
951 (integer :tag "Number")))) 951 (integer :tag "Number")))
952 :version "23.1")
952 953
953(defcustom bibtex-expand-strings nil 954(defcustom bibtex-expand-strings nil
954 "If non-nil, expand strings when extracting the content of a BibTeX field." 955 "If non-nil, expand strings when extracting the content of a BibTeX field."