emacs: lisp/vc.el comparison

comparison lisp/vc.el @ 67882:59639203f09a

(vc-annotate-mode-map): Remove obsolete binding. (vc-annotate-mode-menu): Remove left-over redundant declaration. Correct the construction of span entries. Simplify. (vc-annotate-display-select): Fix the nil case. (vc-annotate): Remove obsolete (and now broken) code. (vc-annotate-extract-revision-at-line): Remove obsolete code. (vc-annotate-time-span): Remove unused arg `quantize'. Simplify.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Wed, 28 Dec 2005 18:47:12 +0000
parents	f4a3c7808545
children	e60b008e862d

comparison

equal deleted inserted replaced

-:d9ec339158fe
+:59639203f09a
 :type '(repeat number)
 :group 'vc)
 (defvar vc-annotate-mode-map
 (let ((m (make-sparse-keymap)))
-(define-key m [menu-bar] (make-sparse-keymap "VC-Annotate"))
 (define-key m "A" 'vc-annotate-revision-previous-to-line)
 (define-key m "D" 'vc-annotate-show-diff-revision-at-line)
 (define-key m "J" 'vc-annotate-revision-at-line)
 (define-key m "L" 'vc-annotate-show-log-revision-at-line)
 (define-key m "N" 'vc-annotate-next-version)
 (define-key m "P" 'vc-annotate-prev-version)
 (define-key m "W" 'vc-annotate-workfile-version)
 m)
 "Local keymap used for VC-Annotate mode.")
-(defvar vc-annotate-mode-menu nil
-"Local keymap used for VC-Annotate mode's menu bar menu.")
 ;; Header-insertion hair
 (defcustom vc-static-header-alist
 '(("\\.c\\'" .
 	(if (< date oldest)
 	    (setq oldest date))))
 (vc-annotate-display
 (vc-annotate-time-span		;return the scaled colormap.
 vc-annotate-color-map
-(/ (-  (if full newest current) oldest)
+(/ (- (if full newest current) oldest)
 	 (vc-annotate-car-last-cons vc-annotate-color-map)))
 (if full newest))
 (message "Redisplaying annotation...done \(%s\)"
 	     (if full
 		 (format "Spanned from %.1f to %.1f days old"
 (vc-annotate-display-select))
 :style toggle :selected (null vc-annotate-display-mode)]
 ,@(let ((oldest-in-map (vc-annotate-car-last-cons vc-annotate-color-map)))
 (mapcar (lambda (element)
 (let ((days (* element oldest-in-map)))
-`([,(format "Span %.1f days" days)
+`[,(format "Span %.1f days" days)
-(unless (and (numberp vc-annotate-display-mode)
+(vc-annotate-display-select nil ,days)
-(= vc-annotate-display-mode ,days))
+:style toggle :selected
-(vc-annotate-display-select nil ,days))
+(eql vc-annotate-display-mode ,days) ]))
-:style toggle :selected
-(and (numberp vc-annotate-display-mode)
-(= vc-annotate-display-mode ,days)) ])))
 vc-annotate-menu-elements))
 ["Span ..."
-(let ((days
+(vc-annotate-display-select
-(float (string-to-number
+nil (float (string-to-number (read-string "Span how many days? "))))]
-(read-string "Span how many days? ")))))
-(vc-annotate-display-select nil days)) t]
 "--"
 ["Span to Oldest"
 (unless (eq vc-annotate-display-mode 'scale)
 (vc-annotate-display-select nil 'scale))
 :style toggle :selected
 (set-buffer buffer)
 (display-buffer buffer))
 (if (not vc-annotate-parent-rev)
 (vc-annotate-mode))
 (cond ((null vc-annotate-display-mode)
+;; The ratio is global, thus relative to the global color-map.
+(kill-local-variable 'vc-annotate-color-map)
 	 (vc-annotate-display-default vc-annotate-ratio))
 	;; One of the auto-scaling modes
 	((eq vc-annotate-display-mode 'scale)
 	 (vc-annotate-display-autoscale))
 	((eq vc-annotate-display-mode 'fullscale)
 ;; revision, so we should update the buffer's name.
 (if buf (with-current-buffer buf
 	      (rename-buffer temp-buffer-name t)
 	      ;; In case it had to be uniquified.
 	      (setq temp-buffer-name (buffer-name))))
-(if (not (vc-find-backend-function vc-annotate-backend 'annotate-command))
-	(error "Sorry, annotating is not implemented for %s"
-	       vc-annotate-backend))
 (with-output-to-temp-buffer temp-buffer-name
 (vc-call annotate-command file (get-buffer temp-buffer-name) rev))
 (with-current-buffer temp-buffer-name
 (set (make-local-variable 'vc-annotate-backend) (vc-backend file))
 (set (make-local-variable 'vc-annotate-parent-file) file)
 	(vc-annotate-warp-version warp-rev)))))
 (defun vc-annotate-extract-revision-at-line ()
 "Extract the revision number of the current line."
 ;; This function must be invoked from a buffer in vc-annotate-mode
-(save-window-excursion
-(vc-ensure-vc-buffer)
-(setq vc-annotate-backend (vc-backend buffer-file-name)))
 (vc-call-backend vc-annotate-backend 'annotate-extract-revision-at-line))
 (defun vc-annotate-revision-at-line ()
 "Visit the annotation of the version identified in the current line."
 (interactive)
 (current-buffer))
 	(goto-line (min oldline (progn (goto-char (point-max))
 				       (previous-line)
 				       (line-number-at-pos))))))))
-(defun vc-annotate-time-span (a-list span &optional quantize)
+(defun vc-annotate-time-span (a-list span)
 "Apply factor SPAN to the time-span of association list A-LIST.
-Return the new alist.
+Return the new alist."
-Optionally quantize to the factor of QUANTIZE."
 ;; Apply span to each car of every cons
-(if (not (eq nil a-list))
+(mapcar (lambda (elem) (cons (* (car elem) span) (cdr elem)))
-(append (list (cons (* (car (car a-list)) span)
+a-list))
-			  (cdr (car a-list))))
-	      (vc-annotate-time-span (nthcdr (or quantize ; optional
-						 1) ; Default to cdr
-					     a-list) span quantize))))
 (defun vc-annotate-compcar (threshold a-list)
 "Test successive cons cells of A-LIST against THRESHOLD.
 Return the first cons cell with a car that is not less than THRESHOLD,
 nil if no such cell exists."

Mercurial > emacs

comparison lisp/vc.el @ 67882:59639203f09a