Mercurial > emacs
changeset 105763:5041ae86859e
(all-completions): Declare the 4th arg obsolete.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 26 Oct 2009 03:39:15 +0000 |
| parents | 5f2c736569a0 |
| children | a5db863758a8 |
| files | etc/NEWS lisp/ChangeLog lisp/minibuffer.el lisp/subr.el src/minibuf.c |
| diffstat | 5 files changed, 53 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Sun Oct 25 20:38:06 2009 +0000 +++ b/etc/NEWS Mon Oct 26 03:39:15 2009 +0000 @@ -256,6 +256,8 @@ * Lisp changes in Emacs 23.2 +** The 4th arg to all-completions (aka hide-spaces) is declared obsolete. + ** read-file-name-predicate is obsolete. It was used to pass the predicate to read-file-name-internal because read-file-name-internal abused its `pred' argument to pass the current directory, but this hack is not needed
--- a/lisp/ChangeLog Sun Oct 25 20:38:06 2009 +0000 +++ b/lisp/ChangeLog Mon Oct 26 03:39:15 2009 +0000 @@ -1,3 +1,7 @@ +2009-10-26 Stefan Monnier <monnier@iro.umontreal.ca> + + * subr.el (all-completions): Declare the 4th arg obsolete. + 2009-10-25 Stefan Monnier <monnier@iro.umontreal.ca> * pcomplete.el (pcomplete-unquote-argument-function): New var. @@ -10,6 +14,36 @@ * bookmark.el (bookmark-bmenu-list): Don't use switch-to-buffer if we're inside a dedicated or minibuffer window. +2009-10-25 Stefan Monnier <monnier@iro.umontreal.ca> + + * cedet/semantic/fw.el (semantic-alias-obsolete) + (semantic-varalias-obsolete): Make the `when' arg mandatory. + (define-mode-overload-implementation): + * cedet/semantic/decorate/mode.el (semantic-decorate-pending-decoration-hooks): + * cedet/semantic/wisent.el (wisent-lex-make-token-table): + * cedet/semantic/util.el (semantic-file-token-stream) + (semantic-something-to-stream): + * cedet/semantic/tag.el (semantic-tag-make-assoc-list) + (semantic-expand-nonterminal): + * cedet/semantic/tag-file.el (semantic-find-nonterminal) + (semantic-find-dependency, semantic-find-nonterminal) + (semantic-find-dependency): + * cedet/semantic/lex.el (semantic-flex-start, semantic-flex-end) + (semantic-flex-text, semantic-flex-make-keyword-table) + (semantic-flex-keyword-p, semantic-flex-keyword-put) + (semantic-flex-keyword-get, semantic-flex-map-keywords) + (semantic-flex-keywords, semantic-flex-buffer, semantic-flex-list): + * cedet/semantic/java.el (semantic-java-prototype-nonterminal): + * cedet/semantic/idle.el (semantic-before-idle-scheduler-reparse-hooks) + (semantic-after-idle-scheduler-reparse-hooks): + * cedet/semantic/edit.el (semantic-edits-incremental-reparse-failed-hooks): + * cedet/semantic/db-mode.el (semanticdb-mode-hooks): + * cedet/semantic.el (semantic-toplevel-bovine-table) + (semantic-toplevel-bovine-cache) + (semantic-before-toplevel-bovination-hook, semantic-init-hooks) + (semantic-init-mode-hooks, semantic-init-db-hooks) + (semantic-bovination-working-type): Provide the `when' arg. + 2009-10-24 Karl Fogel <kfogel@red-bean.com> * bookmark.el: Update documentation, especially documentation
--- a/lisp/minibuffer.el Sun Oct 25 20:38:06 2009 +0000 +++ b/lisp/minibuffer.el Mon Oct 26 03:39:15 2009 +0000 @@ -40,9 +40,17 @@ ;; corresponding to the displayed completions because we only ;; provide the start info but not the end info in ;; completion-base-position. +;; - quoting is problematic. E.g. the double-dollar quoting used in +;; substitie-in-file-name (and hence read-file-name-internal) bumps +;; into various bugs: ;; - choose-completion doesn't know how to quote the text it inserts. ;; E.g. it fails to double the dollars in file-name completion, or ;; to backslash-escape spaces and other chars in comint completion. +;; - when completing ~/tmp/fo$$o, the highligting in *Completions* +;; is off by one position. +;; - all code like PCM which relies on all-completions to match +;; its argument gets confused because all-completions returns unquoted +;; texts (as desired for *Completions* output). ;; - C-x C-f ~/*/sr ? should not list "~/./src". ;; - minibuffer-force-complete completes ~/src/emacs/t<!>/lisp/minibuffer.el ;; to ~/src/emacs/trunk/ and throws away lisp/minibuffer.el. @@ -72,8 +80,6 @@ ;; - add support for ** to pcm. ;; - Add vc-file-name-completion-table to read-file-name-internal. ;; - A feature like completing-help.el. -;; - make lisp/complete.el obsolete. -;; - Make the `hide-spaces' arg of all-completions obsolete? ;;; Code:
--- a/lisp/subr.el Sun Oct 25 20:38:06 2009 +0000 +++ b/lisp/subr.el Mon Oct 26 03:39:15 2009 +0000 @@ -1038,6 +1038,8 @@ "explicitly check for a frame-parameter instead." "22.2") (make-obsolete 'interactive-p 'called-interactively-p "23.2") (set-advertised-calling-convention 'called-interactively-p '(kind)) +(set-advertised-calling-convention + 'all-completions '(string collection &optional predicate)) ;;;; Obsolescence declarations for variables, and aliases. @@ -1885,11 +1887,13 @@ ;; Turn a meta-character into a character with the 0200 bit set. (setq code (logior (logand translated (lognot ?\M-\^@)) 128) done t)) - ((and (<= ?0 translated) (< translated (+ ?0 (min 10 read-quoted-char-radix)))) + ((and (<= ?0 translated) + (< translated (+ ?0 (min 10 read-quoted-char-radix)))) (setq code (+ (* code read-quoted-char-radix) (- translated ?0))) (and prompt (setq prompt (message "%s %c" prompt translated)))) ((and (<= ?a (downcase translated)) - (< (downcase translated) (+ ?a -10 (min 36 read-quoted-char-radix)))) + (< (downcase translated) + (+ ?a -10 (min 36 read-quoted-char-radix)))) (setq code (+ (* code read-quoted-char-radix) (+ 10 (- (downcase translated) ?a)))) (and prompt (setq prompt (message "%s %c" prompt translated))))
--- a/src/minibuf.c Sun Oct 25 20:38:06 2009 +0000 +++ b/src/minibuf.c Mon Oct 26 03:39:15 2009 +0000 @@ -1561,9 +1561,9 @@ Additionally to this predicate, `completion-regexp-list' is used to further constrain the set of candidates. -If the optional fourth argument HIDE-SPACES is non-nil, -strings in COLLECTION that start with a space -are ignored unless STRING itself starts with a space. */) +An osbolete optional fourth argument HIDE-SPACES is still accepted for +backward compatiblity. If non-nil, strings in COLLECTION that start +with a space are ignored unless STRING itself starts with a space. */) (string, collection, predicate, hide_spaces) Lisp_Object string, collection, predicate, hide_spaces; {