(sh-mode): Use skeleton-pair-filter-function.

2 files changed, 41 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf6f64f9227..37e7617f6ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,42 @@
+2006-05-21  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+        * textmodes/bibtex.el (bibtex-maintain-sorted-entries): Mark as
+        safe.
+        
+        * progmodes/make-mode.el (makefile-special-targets-list)
+        (makefile-macro-table, makefile-target-table): Mark as risky.
+        (makefile-query-one-target-method): Make this the alias for the
+        following variable.
+        (makefile-query-one-target-method-function): Make this the real
+        name.
+        
+        * textmodes/artist.el (artist-text-renderer): Make this the alias
+        for the following variable.
+        (artist-text-renderer-function): Make this the real name.
+
+        * textmodes/flyspell.el (flyspell-generic-check-word-p): Make this
+        the alias for the following variable.
+        (flyspell-generic-check-word-predicate): Make this the real name.
+
+        * textmodes/ispell.el (ispell-format-word): Make this the alias
+        for the following variable.
+        (ispell-format-word-function): Make this the real name.
+        (ispell-message-text-end): Mark as risky.
+
+        * skeleton.el (skeleton-transformation, skeleton-filter)
+        (skeleton-pair-filter): Make these the aliases for the following
+        variables.
+        (skeleton-transformation-function, skeleton-filter-function)
+        (skeleton-pair-filter-function): Make these the real names.
+
+        * progmodes/sh-script.el (sh-mode): Use skeleton-filter-function
+        and skeleton-pair-filter-function.
+
+        * textmodes/sgml-mode.el (sgml-transformation): Make this the
+        alias for the following variable.
+        (sgml-transformation-function): Make this the real name.
+        (sgml-tag-alist): Mark as risky.
+
 2006-05-21  Richard Stallman  <rms@gnu.org>
 
         * simple.el (kill-region): Interactively, pass point, then mark.
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 93a30162d91..ab3da050456 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1390,7 +1390,7 @@ with your script for an edit-interpret-debug cycle."
   (make-local-variable 'sh-shell-file)
   (make-local-variable 'sh-shell)
   (make-local-variable 'skeleton-pair-alist)
-  (make-local-variable 'skeleton-pair-filter)
+  (make-local-variable 'skeleton-pair-filter-function)
   (make-local-variable 'comint-dynamic-complete-functions)
   (make-local-variable 'comint-prompt-regexp)
   (make-local-variable 'font-lock-defaults)
@@ -1422,7 +1422,7 @@ with your script for an edit-interpret-debug cycle."
           (font-lock-syntactic-face-function
            . sh-font-lock-syntactic-face-function))
         skeleton-pair-alist '((?` _ ?`))
-        skeleton-pair-filter 'sh-quoted-p
+        skeleton-pair-filter-function 'sh-quoted-p
         skeleton-further-elements '((< '(- (min sh-indentation
                                                 (current-column)))))
         skeleton-filter-function 'sh-feature