aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS7
-rw-r--r--lisp/minibuffer.el4
2 files changed, 9 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 6a705de3622..a4d31a32c9b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3120,8 +3120,10 @@ these cases.
3120These were actually rendered obsolete in Emacs 21 but were never 3120These were actually rendered obsolete in Emacs 21 but were never
3121marked as such. 3121marked as such.
3122 3122
3123---
3123** 'pcomplete-ignore-case' is now an obsolete alias of 'completion-ignore-case'. 3124** 'pcomplete-ignore-case' is now an obsolete alias of 'completion-ignore-case'.
3124 3125
3126+++
3125** 'completions-annotations' face is not used when the caller puts own face. 3127** 'completions-annotations' face is not used when the caller puts own face.
3126This affects the suffix specified by completion 'annotation-function'. 3128This affects the suffix specified by completion 'annotation-function'.
3127 3129
@@ -3130,7 +3132,8 @@ This affects the suffix specified by completion 'annotation-function'.
3130This is instead of the erroneous 'minibuffer-inactive-mode' it 3132This is instead of the erroneous 'minibuffer-inactive-mode' it
3131formerly had. 3133formerly had.
3132 3134
3133** 'make-text-button' no longer text properties of its first argument. 3135---
3136** 'make-text-button' no longer modifies text properties of its first argument.
3134When its first argument is a string, 'make-text-button' no longer 3137When its first argument is a string, 'make-text-button' no longer
3135modifies the string's text properties; instead, it uses and returns 3138modifies the string's text properties; instead, it uses and returns
3136a copy of the string. This helps avoid trouble when strings are 3139a copy of the string. This helps avoid trouble when strings are
@@ -3142,6 +3145,7 @@ If 'minibuffer-allow-text-properties' is non-nil, doing completion
3142over a table of strings with properties will no longer remove all the 3145over a table of strings with properties will no longer remove all the
3143properties before returning. This affects things like 'completing-read'. 3146properties before returning. This affects things like 'completing-read'.
3144 3147
3148---
3145** 'dns-query' now consistently uses Lisp integers to represent integers. 3149** 'dns-query' now consistently uses Lisp integers to represent integers.
3146Formerly it made an exception for integer components of SOA records, 3150Formerly it made an exception for integer components of SOA records,
3147because SOA serial numbers can exceed fixnum ranges on 32-bit platforms. 3151because SOA serial numbers can exceed fixnum ranges on 32-bit platforms.
@@ -3156,6 +3160,7 @@ the Emacs Lisp reference manual for background.
3156+++ 3160+++
3157** The error 'ftp-error' belongs also to category 'remote-file-error'. 3161** The error 'ftp-error' belongs also to category 'remote-file-error'.
3158 3162
3163+++
3159** The WHEN argument of 'make-obsolete' and related functions is mandatory. 3164** The WHEN argument of 'make-obsolete' and related functions is mandatory.
3160The use of those functions without a WHEN argument was marked obsolete 3165The use of those functions without a WHEN argument was marked obsolete
3161back in Emacs 23.1. The affected functions are: 'make-obsolete', 3166back in Emacs 23.1. The affected functions are: 'make-obsolete',
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 539a2c28cde..9668e7c732c 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1807,7 +1807,9 @@ Return nil if there is no valid completion, else t."
1807 (_ t))) 1807 (_ t)))
1808 1808
1809(defface completions-annotations '((t :inherit (italic shadow))) 1809(defface completions-annotations '((t :inherit (italic shadow)))
1810 "Face to use for annotations in the *Completions* buffer.") 1810 "Face to use for annotations in the *Completions* buffer.
1811This face is only used if the strings used for completions
1812doesn't already specify a face.")
1811 1813
1812(defcustom completions-format 'horizontal 1814(defcustom completions-format 'horizontal
1813 "Define the appearance and sorting of completions. 1815 "Define the appearance and sorting of completions.