From f57a951212c6c363a115eab169fd352510364ed6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 4 Nov 2007 23:01:15 +0000 Subject: [PATCH] (define-abbrev-table): Doc fix. --- lisp/ChangeLog | 5 ++++- lisp/abbrev.el | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1dc9a1a478..7eb8ecfa4e3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-11-04 Juanma Barranquero + + * abbrev.el (define-abbrev-table): Doc fix. + 2007-11-04 Thien-Thi Nguyen * info.el (Info-revert-buffer-function): New func. @@ -2138,7 +2142,6 @@ * follow.el (follow-stop-intercept-process-output): Use `follow-call-process-filter' rather than `process-filter'. Simplify. - * vc.el (vc0iff): Prevent errors in an edge case. 2007-10-11 Eric S. Raymond diff --git a/lisp/abbrev.el b/lisp/abbrev.el index 74a0bbf29b9..65890beef0c 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -434,7 +434,7 @@ This is similar to an `around' advice." ,(if (symbolp var) `(if (local-variable-p ',var) (default-value ',var))))))) - + ;;; Code that used to be implemented in src/abbrev.c @@ -637,7 +637,7 @@ either a single abbrev table or a list of abbrev tables." (if (listp (cdr x)) (append (cdr x) tables) (cons (cdr x) tables))))) tables)))) - + (defun abbrev-symbol (abbrev &optional table) "Return the symbol representing abbrev named ABBREV. @@ -665,7 +665,7 @@ The default is to try buffer's mode-specific abbrev table, then global table." sym))))))) (if (symbol-value sym) sym))) - + (defun abbrev-expansion (abbrev &optional table) "Return the string that ABBREV expands into in the current buffer. @@ -697,7 +697,7 @@ then ABBREV is looked up in that table only." (setq name (buffer-substring start end)) (goto-char pos) ; Restore point. (list (abbrev-symbol name tables) name start end))) - + (while (and tables (not (car res))) (let* ((table (pop tables)) (enable-fun (abbrev-table-get table :enable-function))) @@ -889,7 +889,7 @@ Properties with special meaning: abbreviations. - `:case-fixed' non-nil means that abbreviations are looked up without case-folding, and the expansion is not capitalized/upcased. -- `:regexp' describes the form of abbrevs. It defaults to \\<\\(\\w+\\)\\W* which +- `:regexp' describes the form of abbrevs. It defaults to \\=\\<\\(\\w+\\)\\W* which means that an abbrev can only be a single word. The submatch 1 is treated as the potential name of an abbrev. - `:enable-function' can be set to a function of no argument which returns -- 2.39.2