[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110482: Make cusver handle options m
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110482: Make cusver handle options moved from C to lisp |
Date: |
Tue, 09 Oct 2012 00:00:23 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110482
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-09 00:00:23 -0700
message:
Make cusver handle options moved from C to lisp
* admin/admin.el (cusver-scan-cus-start): New function.
(cusver-check): Scan old cus-start.el.
modified:
admin/ChangeLog
admin/admin.el
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2012-10-07 00:54:36 +0000
+++ b/admin/ChangeLog 2012-10-09 07:00:23 +0000
@@ -1,3 +1,8 @@
+2012-10-09 Glenn Morris <address@hidden>
+
+ * admin.el (cusver-scan-cus-start): New function.
+ (cusver-check): Scan old cus-start.el.
+
2012-10-07 Glenn Morris <address@hidden>
* admin.el (cusver-new-version): Set default.
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2012-10-07 00:54:36 +0000
+++ b/admin/admin.el 2012-10-09 07:00:23 +0000
@@ -446,8 +446,6 @@
(1+ emacs-minor-version))
"Version number that new defcustoms should have.")
-;; TODO do something about renamed variables with aliases to the old name?
-;; Scan old cus-start.el to find variables moved from C to lisp?
(defun cusver-scan (file &optional old)
"Scan FILE for `defcustom' calls.
Return a list with elements of the form (VAR . VER),
@@ -486,6 +484,21 @@
(message "%sdone" m)
alist))
+(defun cusver-scan-cus-start (file)
+ "Scan cus-start.el and return an alist with elements (VAR . VER)."
+ (if (file-readable-p file)
+ (with-temp-buffer
+ (insert-file-contents file)
+ (when (search-forward "(let ((all '(" nil t)
+ (backward-char 1)
+ (let (var ver alist)
+ (dolist (elem (ignore-errors (read (current-buffer))))
+ (when (symbolp (setq var (car-safe elem)))
+ (or (stringp (setq ver (nth 3 elem)))
+ (setq ver nil))
+ (setq alist (cons (cons var ver) alist))))
+ alist)))))
+
(define-button-type 'cusver-xref 'action #'cusver-goto-xref)
(defun cusver-goto-xref (button)
@@ -501,11 +514,9 @@
(pop-to-buffer (current-buffer))))))
;; You should probably at least do a grep over the old directory
-;; to check the results of this look sensible. Eg cus-start if
-;; something moved from C to Lisp.
-;; TODO handle renamed things with aliases to the old names.
-;; What to do about new files? Does everything in there need a :version,
-;; or eg just the defgroup?
+;; to check the results of this look sensible.
+;; TODO Check cus-start if something moved from C to Lisp.
+;; TODO Handle renamed things with aliases to the old names.
(defun cusver-check (newdir olddir version)
"Check that defcustoms have :version tags where needed.
NEWDIR is the current lisp/ directory, OLDDIR is that from the previous
@@ -537,6 +548,8 @@
(message "Reading old defcustoms...")
(dolist (file oldfiles)
(setq oldcus (append oldcus (cusver-scan file t))))
+ (setq oldcus (append oldcus (cusver-scan-cus-start
+ (expand-file-name "cus-start.el" olddir))))
;; newcus has elements (FILE (VAR VER) ... ).
;; oldcus just (VAR . VER).
(message "Checking for version tags...")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110482: Make cusver handle options moved from C to lisp,
Glenn Morris <=