[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114331: * lisp/cedet/semantic/symref/list.el (seman
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r114331: * lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode): |
Date: |
Tue, 17 Sep 2013 15:50:29 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114331
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 11:50:33 -0400
message:
* lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode):
Use define-derived-mode.
(semantic-symref-produce-list-on-results): Set up the results here
instead of in semantic-symref-results-mode. Move after
semantic-symref-current-results's defvar now that it refers to that var.
(semantic-symref-auto-expand-results)
(semantic-symref-results-summary-function)
(semantic-symref-results-mode-hook): Remove redundant :group arg.
(semantic-symref, semantic-symref-symbol, semantic-symref-regexp):
Initialize directly in the let.
modified:
lisp/cedet/ChangeLog changelog-20100919015713-3rbr456yray5m84f-1
lisp/cedet/semantic/symref/list.el
list.el-20091113204419-o5vbwnq5f7feedwu-11301
lisp/cedet/srecode/srt-mode.el
srtmode.el-20091113204419-o5vbwnq5f7feedwu-11338
=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog 2013-09-17 07:45:18 +0000
+++ b/lisp/cedet/ChangeLog 2013-09-17 15:50:33 +0000
@@ -1,3 +1,16 @@
+2013-09-17 Stefan Monnier <address@hidden>
+
+ * semantic/symref/list.el (semantic-symref-results-mode):
+ Use define-derived-mode.
+ (semantic-symref-produce-list-on-results): Set up the results here
+ instead of in semantic-symref-results-mode. Move after
+ semantic-symref-current-results's defvar now that it refers to that var.
+ (semantic-symref-auto-expand-results)
+ (semantic-symref-results-summary-function)
+ (semantic-symref-results-mode-hook): Remove redundant :group arg.
+ (semantic-symref, semantic-symref-symbol, semantic-symref-regexp):
+ Initialize directly in the let.
+
2013-09-13 Glenn Morris <address@hidden>
* semantic/ia.el (semantic-ia-complete-symbol-menu):
=== modified file 'lisp/cedet/semantic/symref/list.el'
--- a/lisp/cedet/semantic/symref/list.el 2013-05-15 23:55:41 +0000
+++ b/lisp/cedet/semantic/symref/list.el 2013-09-17 15:50:33 +0000
@@ -48,18 +48,18 @@
Display the references in `semantic-symref-results-mode'."
(interactive)
(semantic-fetch-tags)
- (let ((ct (semantic-current-tag))
- (res nil)
- )
+ (let ((ct (semantic-current-tag)))
;; Must have a tag...
(when (not ct) (error "Place cursor inside tag to be searched for"))
;; Check w/ user.
- (when (not (y-or-n-p (format "Find references for %s? " (semantic-tag-name
ct))))
+ (when (not (y-or-n-p (format "Find references for %s? "
+ (semantic-tag-name ct))))
(error "Quit"))
;; Gather results and tags
(message "Gathering References...")
- (setq res (semantic-symref-find-references-by-name (semantic-tag-name ct)))
- (semantic-symref-produce-list-on-results res (semantic-tag-name ct))))
+ (let* ((name (semantic-tag-name ct))
+ (res (semantic-symref-find-references-by-name name)))
+ (semantic-symref-produce-list-on-results res name))))
;;;###autoload
(defun semantic-symref-symbol (sym)
@@ -72,11 +72,9 @@
(interactive (list (semantic-tag-name (semantic-complete-read-tag-project
"Symrefs for: "))))
(semantic-fetch-tags)
- (let ((res nil)
- )
- ;; Gather results and tags
- (message "Gathering References...")
- (setq res (semantic-symref-find-references-by-name sym))
+ ;; Gather results and tags
+ (message "Gathering References...")
+ (let ((res (semantic-symref-find-references-by-name sym)))
(semantic-symref-produce-list-on-results res sym)))
;;;###autoload
@@ -90,28 +88,11 @@
(interactive (list (semantic-tag-name (semantic-complete-read-tag-buffer-deep
"Symrefs for: "))))
(semantic-fetch-tags)
- (let ((res nil)
- )
- ;; Gather results and tags
- (message "Gathering References...")
- (setq res (semantic-symref-find-text sym))
+ (message "Gathering References...")
+ ;; Gather results and tags
+ (let ((res (semantic-symref-find-text sym)))
(semantic-symref-produce-list-on-results res sym)))
-
-(defun semantic-symref-produce-list-on-results (res str)
- "Produce a symref list mode buffer on the results RES."
- (when (not res) (error "No references found"))
- (semantic-symref-result-get-tags res t)
- (message "Gathering References...done")
- ;; Build a references buffer.
- (let ((buff (get-buffer-create
- (format "*Symref %s" str)))
- )
- (switch-to-buffer-other-window buff)
- (set-buffer buff)
- (semantic-symref-results-mode res))
- )
-
;;; RESULTS MODE
;;
(defgroup semantic-symref-results-mode nil
@@ -178,36 +159,35 @@
(defcustom semantic-symref-auto-expand-results nil
"Non-nil to expand symref results on buffer creation."
- :group 'semantic-symref-results-mode
:type 'boolean)
(defcustom semantic-symref-results-mode-hook nil
"Hook run when `semantic-symref-results-mode' starts."
- :group 'semantic-symref-results-mode
:type 'hook)
(defvar semantic-symref-current-results nil
"The current results in a results mode buffer.")
-(defun semantic-symref-results-mode (results)
- ;; FIXME: Use define-derived-mode.
- "Major-mode for displaying Semantic Symbol Reference RESULTS.
-RESULTS is an object of class `semantic-symref-results'."
- (interactive)
- (kill-all-local-variables)
- (setq major-mode 'semantic-symref-results-mode
- mode-name "Symref"
- )
- (use-local-map semantic-symref-results-mode-map)
- (set (make-local-variable 'semantic-symref-current-results)
- results)
- (semantic-symref-results-dump results)
- (goto-char (point-min))
+(defun semantic-symref-produce-list-on-results (res str)
+ "Produce a symref list mode buffer on the results RES."
+ (when (not res) (error "No references found"))
+ (semantic-symref-result-get-tags res t)
+ (message "Gathering References...done")
+ ;; Build a references buffer.
+ (let ((buff (get-buffer-create (format "*Symref %s" str))))
+ (switch-to-buffer-other-window buff)
+ (set-buffer buff)
+ (semantic-symref-results-mode)
+ (set (make-local-variable 'semantic-symref-current-results) res)
+ (semantic-symref-results-dump res)
+ (goto-char (point-min))))
+
+(define-derived-mode semantic-symref-results-mode nil "Symref"
+ "Major-mode for displaying Semantic Symbol Reference results."
(buffer-disable-undo)
+ ;; FIXME: Why bother turning off font-lock?
(set (make-local-variable 'font-lock-global-modes) nil)
- (font-lock-mode -1)
- (run-mode-hooks 'semantic-symref-results-mode-hook)
- )
+ (font-lock-mode -1))
(defun semantic-symref-hide-buffer ()
"Hide buffer with semantic-symref results."
@@ -215,9 +195,8 @@
(bury-buffer))
(defcustom semantic-symref-results-summary-function
'semantic-format-tag-prototype
- "*Function to use when creating items in Imenu.
+ "Function to use when creating items in Imenu.
Some useful functions are found in `semantic-format-tag-functions'."
- :group 'semantic-symref-results-mode
:type semantic-format-tag-custom-list)
(defun semantic-symref-results-dump (results)
=== modified file 'lisp/cedet/srecode/srt-mode.el'
--- a/lisp/cedet/srecode/srt-mode.el 2013-03-21 22:11:03 +0000
+++ b/lisp/cedet/srecode/srt-mode.el 2013-09-17 15:50:33 +0000
@@ -188,6 +188,7 @@
;;;###autoload
(define-derived-mode srecode-template-mode fundamental-mode "SRecode"
+ ;; FIXME: Shouldn't it derive from prog-mode?
"Major-mode for writing SRecode macros."
(set (make-local-variable 'comment-start) ";;")
(set (make-local-variable 'comment-end) "")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114331: * lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode):,
Stefan Monnier <=