[Emacs-diffs] /srv/bzr/emacs/trunk r104115: Small addition to glasses.el (bug#8524)

[Glenn Morris]

------------------------------------------------------------
revno: 104115
fixes bug(s): http://debbugs.gnu.org/8524
author: Milan Zamazal <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-04 20:26:55 -0700
message:
  Small addition to glasses.el (bug#8524)
  
  * lisp/progmodes/glasses.el (glasses-separate-capital-groups): New option.
  (glasses-make-readable): Use glasses-separate-capital-groups.
modified:
  lisp/ChangeLog
  lisp/progmodes/glasses.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-05 00:06:10 +0000
+++ b/lisp/ChangeLog    2011-05-05 03:26:55 +0000
@@ -1,3 +1,8 @@
+2011-05-05  Milan Zamazal  <address@hidden>
+
+       * progmodes/glasses.el (glasses-separate-capital-groups): New option.
+       (glasses-make-readable): Use glasses-separate-capital-groups.
+
 2011-05-05  Juanma Barranquero  <address@hidden>
 
        * emacs-lisp/warnings.el (warning-level-aliases): Reflow docstring.

=== modified file 'lisp/progmodes/glasses.el'
--- a/lisp/progmodes/glasses.el 2011-04-22 18:44:26 +0000
+++ b/lisp/progmodes/glasses.el 2011-05-05 03:26:55 +0000
@@ -116,6 +116,15 @@
   :group 'glasses
   :type '(repeat regexp))
 
+(defcustom glasses-separate-capital-groups t
+  "If non-nil, try to separate groups of capital letters.
+When the value is non-nil, HTMLSomething and IPv6 are displayed
+as HTML_Something and I_Pv6 respectively.  Set the value to nil
+if you prefer to display them unchanged."
+  :group 'glasses
+  :type 'boolean
+  :version "24.1")
+
 (defcustom glasses-uncapitalize-p nil
   "If non-nil, downcase embedded capital letters in identifiers.
 Only identifiers starting with lower case letters are affected, letters inside
@@ -212,8 +221,11 @@
                                'glasses-init))
        ;; Face + separator
        (goto-char beg)
-       (while (re-search-forward "[a-z]\\([A-Z]\\)\\|[A-Z]\\([A-Z]\\)[a-z]"
-                                 end t)
+       (while (re-search-forward
+                (if glasses-separate-capital-groups
+                    "[a-z]\\([A-Z]\\)\\|[A-Z]\\([A-Z]\\)[a-z]"
+                  "[a-z]\\([A-Z]\\)")
+                end t)
          (let* ((n (if (match-string 1) 1 2))
                 (o (glasses-make-overlay (match-beginning n) (match-end n))))
            (goto-char (match-beginning n))