fix typos

[gnu-emacs] / lisp / progmodes / glasses.el

diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index f59ce2b09e1fd9446c403127dd42872ed14569ab..dea40b8db19da531c7697f9bc502b339c16a34a0 100644 (file)
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -1,9 +1,9 @@
 ;;; glasses.el --- make cantReadThis readable
 
 ;;; glasses.el --- make cantReadThis readable
 

-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.

 
 

-;; Author: Milan Zamazal <pdm@freesoft.cz>
-;; Maintainer: Milan Zamazal <pdm@freesoft.cz>
+;; Author: Milan Zamazal <pdm@zamazal.org>
+;; Maintainer: Milan Zamazal <pdm@zamazal.org>

 ;; Keywords: tools
 
 ;; This file is part of GNU Emacs.
 ;; Keywords: tools
 
 ;; This file is part of GNU Emacs.


@@ -62,6 +62,7 @@
 
 (defgroup glasses nil
   "Make unreadable code likeThis(one) readable."
 
 (defgroup glasses nil
   "Make unreadable code likeThis(one) readable."

+  :version "21.1"

   :group 'tools)
 
 
   :group 'tools)
 
 


@@ -128,7 +129,7 @@ separators too."
 (defun glasses-custom-set (symbol value)
   "Set value of the variable SYMBOL to VALUE and update overlay categories.
 Used in :set parameter of some customized glasses variables."
 (defun glasses-custom-set (symbol value)
   "Set value of the variable SYMBOL to VALUE and update overlay categories.
 Used in :set parameter of some customized glasses variables."

-  (set symbol value)
+  (set-default symbol value)

   (glasses-set-overlay-properties))
 
 
   (glasses-set-overlay-properties))
 
 


@@ -197,7 +198,7 @@ CATEGORY is the overlay category.  If it is nil, use the `glasses' category."
        ;; Parentheses
        (when glasses-separate-parentheses-p
          (goto-char beg)
        ;; Parentheses
        (when glasses-separate-parentheses-p
          (goto-char beg)

-         (while (re-search-forward "[a-zA-Z]\\(\(\\)" end t)
+         (while (re-search-forward "[a-zA-Z]_*\\(\(\\)" end t)

            (glasses-make-overlay (match-beginning 1) (match-end 1)
                                  'glasses-parenthesis)))))))
 
            (glasses-make-overlay (match-beginning 1) (match-end 1)
                                  'glasses-parenthesis)))))))
 


@@ -228,13 +229,13 @@ recognized according to the current value of the variable `glasses-separator'."
            (goto-char (match-end n))))
        (when glasses-separate-parentheses-p
          (goto-char (point-min))
            (goto-char (match-end n))))
        (when glasses-separate-parentheses-p
          (goto-char (point-min))

-         (while (re-search-forward "[a-zA-Z]\\( \\)\(" nil t)
+         (while (re-search-forward "[a-zA-Z]_*\\( \\)\(" nil t)

            (replace-match "" t nil nil 1))))))
   ;; nil must be returned to allow use in write file hooks
   nil)
 
 
            (replace-match "" t nil nil 1))))))
   ;; nil must be returned to allow use in write file hooks
   nil)
 
 

-(defun glasses-change (beg end old-len)
+(defun glasses-change (beg end &optional old-len)

   "After-change function updating glass overlays."
   (let ((beg-line (save-excursion (goto-char beg) (line-beginning-position)))
        (end-line (save-excursion (goto-char end) (line-end-position))))
   "After-change function updating glass overlays."
   (let ((beg-line (save-excursion (goto-char beg) (line-beginning-position)))
        (end-line (save-excursion (goto-char end) (line-end-position))))


@@ -245,40 +246,26 @@ recognized according to the current value of the variable `glasses-separator'."
 ;;; Minor mode definition
 
 
 ;;; Minor mode definition
 
 

-(defvar glasses-mode nil
-  "Mode variable for `glasses-mode'.")
-(make-variable-buffer-local 'glasses-mode)
-
-(add-to-list 'minor-mode-alist '(glasses-mode " o^o"))
-
-

 ;;;###autoload
 ;;;###autoload

-(defun glasses-mode (arg)
+(define-minor-mode glasses-mode

   "Minor mode for making identifiers likeThis readable.
 When this mode is active, it tries to add virtual separators (like underscores)
 at places they belong to."
   "Minor mode for making identifiers likeThis readable.
 When this mode is active, it tries to add virtual separators (like underscores)
 at places they belong to."

-  (interactive "P")
-  (let ((new-flag (if (null arg)
-                      (not glasses-mode)
-                   (> (prefix-numeric-value arg) 0))))
-    (unless (eq new-flag glasses-mode)
-      (save-excursion
-       (save-restriction
-         (widen)
-         ;; We erase the all overlays anyway, to avoid dual sight in some
-         ;; circumstances
-         (glasses-make-unreadable (point-min) (point-max))
-         (if new-flag
-             (progn
-               (glasses-make-readable (point-min) (point-max))
-               (make-local-hook 'after-change-functions)
-               (add-hook 'after-change-functions 'glasses-change nil t)
-               (add-hook 'local-write-file-hooks
-                         'glasses-convert-to-unreadable nil t))
-           (remove-hook 'after-change-functions 'glasses-change t)
-           (remove-hook 'local-write-file-hooks
-                        'glasses-convert-to-unreadable t))))
-      (setq glasses-mode new-flag))))
+  nil " o^o" nil
+  (save-excursion
+    (save-restriction
+      (widen)
+      ;; We erase all the overlays anyway, to avoid dual sight in some
+      ;; circumstances
+      (glasses-make-unreadable (point-min) (point-max))
+      (if glasses-mode
+         (progn
+           (jit-lock-register 'glasses-change)
+           (add-hook 'local-write-file-hooks
+                     'glasses-convert-to-unreadable nil t))
+       (jit-lock-unregister 'glasses-change)
+       (remove-hook 'local-write-file-hooks
+                    'glasses-convert-to-unreadable t)))))

 
 
 ;;; Announce
 
 
 ;;; Announce


@@ -286,4 +273,5 @@ at places they belong to."
 (provide 'glasses)
 
 
 (provide 'glasses)
 
 

+;;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12

 ;;; glasses.el ends here
 ;;; glasses.el ends here