* dabbrev.el (dabbrev-filter-elements): Use the new backquote syntax.

2 files changed, 22 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdc88905563..27426f615de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,21 +1,25 @@
+1999-11-15  Sam Steingold  <sds@ksp.com>
+
+        * dabbrev.el (dabbrev-filter-elements): Use the new backquote syntax.
+
 1999-02-22  Sam Steingold  <sds@goems.com>
- 
+
         * goto-addr.el (goto-address-at-mouse,
         goto-address-find-address-at-point): use compose-mail.
         (goto-address-mail-method): removed variable.
         (goto-address-send-using-mh-e, goto-address-send-using-mhe,
         goto-address-send-using-mail): removed functions.
- 
+
 1998-11-03  Sam Steingold  <sds@goems.com>
- 
+
         * simple.el (backward-delete-char-untabify):
         backward-delete-char-untabify-method can be `all' now - to delete
         hungrily including newlines.
- 
+
 1999-11-15  Sam Steingold  <sds@ksp.com>
 
         * mail/rnews.el, mail/mh-utils.el: Use the new backquote syntax.
-        
+
 1999-11-15  Dave Love  <fx@gnu.org>
 
         * cus-edit.el (customize-face, customize-face-other-window):
@@ -41,10 +45,10 @@
 
         * ansi-color.el (ansi-color-apply): Updated regexps to include
         highlighted face.
-        
+
 1999-01-14  Johan Vromans  <jvromans@squirrel.nl>
 
-        * forms.el (forms--make-format-elt-using-text-properties): 
+        * forms.el (forms--make-format-elt-using-text-properties):
         Treat `intangible' differently.
 
         * forms.el: Use new backquote syntax.
@@ -61,7 +65,7 @@
         (smbclient-prompt-regexp, smbclient-font-lock-keywords): New
         variables
         (smbclient, smbclient-list-shares): New functions
-        
+
 1999-11-12  Sam Steingold  <sds@ksp.com>
 
         * emulation/viper-init.el (viper-deflocalvar, viper-loop)
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 371037312e2..909b86dbbcf 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -310,14 +310,14 @@ this list.")
 ;; variable ELEMENT, and include it in the result
 ;; if CONDITION evaluates non-nil.
 (defmacro dabbrev-filter-elements (element list condition)
-  (` (let (dabbrev-result dabbrev-tail (, element))
-       (setq dabbrev-tail (, list))
-       (while dabbrev-tail
-         (setq (, element) (car dabbrev-tail))
-         (if (, condition)
-             (setq dabbrev-result (cons (, element) dabbrev-result)))
-         (setq dabbrev-tail (cdr dabbrev-tail)))
-       (nreverse dabbrev-result))))
+  `(let (dabbrev-result dabbrev-tail ,element)
+    (setq dabbrev-tail ,list)
+    (while dabbrev-tail
+      (setq ,element (car dabbrev-tail))
+      (if ,condition
+          (setq dabbrev-result (cons ,element dabbrev-result)))
+      (setq dabbrev-tail (cdr dabbrev-tail)))
+    (nreverse dabbrev-result)))
 
 ;;----------------------------------------------------------------
 ;; Exported functions
@@ -569,7 +569,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
                       (equal abbrev (upcase abbrev)))))
 
       ;; Save state for re-expand.
-      (setq dabbrev--last-expansion expansion)  
+      (setq dabbrev--last-expansion expansion)
       (setq dabbrev--last-abbreviation abbrev)
       (setq dabbrev--last-abbrev-location (point-marker))))))
 
@@ -630,7 +630,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
     (dabbrev--goto-start-of-abbrev)
     (buffer-substring-no-properties
      dabbrev--last-abbrev-location (point))))
-        
+
 ;;; Initializes all global variables
 (defun dabbrev--reset-global-variables ()
   ;; dabbrev--last-obarray and dabbrev--last-completion-buffer