[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112860: Introduce and use prog-prett
From: |
Ted Zlatanov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112860: Introduce and use prog-prettify-install. |
Date: |
Wed, 05 Jun 2013 13:48:50 -0400 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112860
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Wed 2013-06-05 13:48:50 -0400
message:
Introduce and use prog-prettify-install.
modified:
lisp/ChangeLog
lisp/emacs-lisp/lisp-mode.el
lisp/progmodes/cfengine.el
lisp/progmodes/perl-mode.el
lisp/simple.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-06-05 15:03:37 +0000
+++ b/lisp/ChangeLog 2013-06-05 17:48:50 +0000
@@ -1,5 +1,23 @@
2013-06-05 Teodor Zlatanov <address@hidden>
+ * simple.el (prog-prettify-symbols): Add version.
+ (prog-prettify-install): Add convenience function to prettify symbols.
+
+ * progmodes/perl-mode.el (perl--augmented-font-lock-keywords)
+ (perl--augmented-font-lock-keywords-1)
+ (perl--augmented-font-lock-keywords-2, perl-mode): Remove unneeded
+ variables and use it.
+
+ * progmodes/cfengine.el (cfengine3--augmented-font-lock-keywords)
+ (cfengine3-mode): Remove unneeded variable and use it.
+
+ * emacs-lisp/lisp-mode.el (lisp--augmented-font-lock-keywords)
+ (lisp--augmented-font-lock-keywords-1)
+ (lisp--augmented-font-lock-keywords-2, lisp-mode-variables):
+ Remove unneeded variables and use it.
+
+2013-06-05 Teodor Zlatanov <address@hidden>
+
* net/tls.el (open-tls-stream): Remove unneeded buffer contents up
to point when opening the connection.
Suggested by João Távora <address@hidden> in
=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el 2013-06-05 14:26:50 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el 2013-06-05 17:48:50 +0000
@@ -187,11 +187,6 @@
font-lock-string-face))))
font-lock-comment-face))
-;; Temporary variables used to add font-lock keywords dynamically.
-(defvar lisp--augmented-font-lock-keywords)
-(defvar lisp--augmented-font-lock-keywords-1)
-(defvar lisp--augmented-font-lock-keywords-2)
-
(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive)
"Common initialization routine for lisp modes.
The LISP-SYNTAX argument is used by code in inf-lisp.el and is
@@ -228,20 +223,11 @@
(setq-local imenu-generic-expression lisp-imenu-generic-expression)
(setq-local multibyte-syntax-as-symbol t)
(setq-local syntax-begin-function 'beginning-of-defun)
- (setq-local prog-prettify-symbols-alist lisp--prettify-symbols-alist)
- (setq lisp--augmented-font-lock-keywords
- (append lisp-font-lock-keywords
- (prog-prettify-font-lock-symbols-keywords)))
- (setq lisp--augmented-font-lock-keywords-1
- (append lisp-font-lock-keywords-1
- (prog-prettify-font-lock-symbols-keywords)))
- (setq lisp--augmented-font-lock-keywords-2
- (append lisp-font-lock-keywords-2
- (prog-prettify-font-lock-symbols-keywords)))
+ (prog-prettify-install lisp--prettify-symbols-alist)
(setq font-lock-defaults
- `((lisp--augmented-font-lock-keywords
- lisp--augmented-font-lock-keywords-1
- lisp--augmented-font-lock-keywords-2)
+ `((lisp-font-lock-keywords
+ lisp-font-lock-keywords-1
+ lisp-font-lock-keywords-2)
nil ,keywords-case-insensitive nil nil
(font-lock-mark-block-function . mark-defun)
(font-lock-syntactic-face-function
=== modified file 'lisp/progmodes/cfengine.el'
--- a/lisp/progmodes/cfengine.el 2013-06-05 14:26:50 +0000
+++ b/lisp/progmodes/cfengine.el 2013-06-05 17:48:50 +0000
@@ -532,8 +532,6 @@
("=>" . ?⇒)
("::" . ?∷)))
-(defvar cfengine3--augmented-font-lock-keywords)
-
;;;###autoload
(define-derived-mode cfengine3-mode prog-mode "CFE3"
"Major mode for editing CFEngine3 input.
@@ -546,17 +544,10 @@
(set (make-local-variable 'indent-line-function) #'cfengine3-indent-line)
- ;; Define the symbols to be prettified
- (setq-local prog-prettify-symbols-alist cfengine3--prettify-symbols-alist)
-
- ;; Tell font-lock.el how to handle cfengine3 keywords..
- (setq cfengine3--augmented-font-lock-keywords
- (append cfengine3-font-lock-keywords
- (prog-prettify-font-lock-symbols-keywords)))
-
(setq font-lock-defaults
- '(cfengine3--augmented-font-lock-keywords
+ '(cfengine3-font-lock-keywords
nil nil nil beginning-of-defun))
+ (prog-prettify-install cfengine3--prettify-symbols-alist)
;; Use defuns as the essential syntax block.
(set (make-local-variable 'beginning-of-defun-function)
=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el 2013-06-05 14:26:50 +0000
+++ b/lisp/progmodes/perl-mode.el 2013-06-05 17:48:50 +0000
@@ -215,11 +215,6 @@
(defvar perl-font-lock-keywords perl-font-lock-keywords-1
"Default expressions to highlight in Perl mode.")
-;; Temporary variables used to add font-lock keywords dynamically.
-(defvar perl--augmented-font-lock-keywords)
-(defvar perl--augmented-font-lock-keywords-1)
-(defvar perl--augmented-font-lock-keywords-2)
-
(defvar perl-quote-like-pairs
'((?\( . ?\)) (?\[ . ?\]) (?\{ . ?\}) (?\< . ?\>)))
@@ -656,26 +651,14 @@
(setq-local comment-indent-function #'perl-comment-indent)
(setq-local parse-sexp-ignore-comments t)
- ;; Define the symbols to be prettified.
- (setq-local prog-prettify-symbols-alist perl--prettify-symbols-alist)
-
;; Tell font-lock.el how to handle Perl.
- (setq perl--augmented-font-lock-keywords
- (append perl-font-lock-keywords
- (prog-prettify-font-lock-symbols-keywords)))
- (setq perl--augmented-font-lock-keywords-1
- (append perl-font-lock-keywords-1
- (prog-prettify-font-lock-symbols-keywords)))
- (setq perl--augmented-font-lock-keywords-2
- (append perl-font-lock-keywords-2
- (prog-prettify-font-lock-symbols-keywords)))
-
- (setq font-lock-defaults '((perl--augmented-font-lock-keywords
- perl--augmented-font-lock-keywords-1
- perl--augmented-font-lock-keywords-2)
+ (setq font-lock-defaults '((perl-font-lock-keywords
+ perl-font-lock-keywords-1
+ perl-font-lock-keywords-2)
nil nil ((?\_ . "w")) nil
(font-lock-syntactic-face-function
. perl-font-lock-syntactic-face-function)))
+ (prog-prettify-install perl--prettify-symbols-alist)
(setq-local syntax-propertize-function #'perl-syntax-propertize-function)
(add-hook 'syntax-propertize-extend-region-functions
#'syntax-propertize-multiline 'append 'local)
=== modified file 'lisp/simple.el'
--- a/lisp/simple.el 2013-06-05 14:26:50 +0000
+++ b/lisp/simple.el 2013-06-05 17:48:50 +0000
@@ -412,6 +412,7 @@
(const :tag "Mode defaults" t)
(alist :tag "Mode defaults augmented with your own list"
:key-type string :value-type character))
+ :version "24.4"
:group 'languages)
(defun prog--prettify-font-lock-compose-symbol (alist)
@@ -442,6 +443,10 @@
`((,(regexp-opt (mapcar 'car alist) t)
(0 (prog--prettify-font-lock-compose-symbol ',alist)))))))
+(defun prog-prettify-install (alist)
+ (setq-local prog-prettify-symbols-alist alist)
+ (font-lock-add-keywords nil (prog-prettify-font-lock-symbols-keywords)))
+
;; Making and deleting lines.
(defvar hard-newline (propertize "\n" 'hard t 'rear-nonsticky '(hard))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112860: Introduce and use prog-prettify-install.,
Ted Zlatanov <=