(strokes-alphabetic-lessp): Simplify. Doc fix.

(strokes-unload-hook): Remove function and variable.
(strokes-unload-function): New-style unload function,
adapted from `strokes-unload-hook'.

2 files changed, 23 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cdd1822303d..c7d1b834125 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,22 @@
+2007-10-31  Juanma Barranquero  <lekktu@gmail.com>
+
+        * strokes.el (strokes-alphabetic-lessp): Simplify.  Doc fix.
+        (strokes-unload-hook): Remove function and variable.
+        (strokes-unload-function): New-style unload function, adapted
+        from `strokes-unload-hook'.
+
+        * emacs-lisp/cl.el (cl-cannot-unload): Remove function.
+        (cl-unload-hook): Remove variable.
+        (cl-unload-function): New-style unload function, adapted
+        from `cl-cannot-unload'.
+
+        * emacs-lisp/elp.el (elp-unload-hook): Remove function and variable.
+        (elp-unload-function): New-style unload function, adapted
+        from `elp-unload-hook'.
+
 2007-10-31  Sean O'Rourke  <sorourke@cs.ucsd.edu>
 
-        * emacs-lisp/find-func.el (find-library): use library at
+        * emacs-lisp/find-func.el (find-library): Use library at
         point as default interactive argument.
 
 2007-10-31  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/strokes.el b/lisp/strokes.el
index de4123453f5..73e5594664a 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1370,10 +1370,8 @@ If STROKES-MAP is not given, `strokes-global-map' will be used instead."
     (goto-char (point-min))))
 
 (defun strokes-alphabetic-lessp (stroke1 stroke2)
-  "T if command name for STROKE1 is less than STROKE2's in lexicographic order."
-  (let ((command-name-1 (symbol-name (cdr stroke1)))
-        (command-name-2 (symbol-name (cdr stroke2))))
-    (string-lessp command-name-1 command-name-2)))
+  "Return t if STROKE1's command name precedes STROKE2's in lexicographic order."
+  (string-lessp (cdr stroke1) (cdr stroke2)))
 
 (defvar strokes-mode-map
   (let ((map (make-sparse-keymap)))
@@ -1745,11 +1743,11 @@ Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)"
     ;; strokes-decode-buffer does a save-excursion.
     (forward-char)))
 
-(defun strokes-unload-hook ()
+(defun strokes-unload-function ()
+  "Unload the Strokes library."
   (strokes-mode -1)
-  (remove-hook 'kill-emacs-query-functions 'strokes-prompt-user-save-strokes))
-
-(add-hook 'strokes-unload-hook 'strokes-unload-hook)
+  ;; continue standard unloading
+  nil)
 
 (run-hooks 'strokes-load-hook)
 (provide 'strokes)