aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-08-06 09:18:02 +0000
committerGerd Moellmann2000-08-06 09:18:02 +0000
commitdedffa6a6bdfbfe6bb1257579734bc4467ebc7bc (patch)
tree8dfc2b24b4270a8e6b511d3630a91bb8efa13009
parentdc79c3ea3c2fbcaf80b70e33517c573451d671bb (diff)
downloademacs-dedffa6a6bdfbfe6bb1257579734bc4467ebc7bc.tar.gz
emacs-dedffa6a6bdfbfe6bb1257579734bc4467ebc7bc.zip
Use `nth' instead of `first', `second', and `third'.
-rw-r--r--lisp/cvs-status.el13
-rw-r--r--lisp/pcvs-util.el6
-rw-r--r--lisp/pcvs.el26
3 files changed, 24 insertions, 21 deletions
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index b7cfdff9d3c..4f46fb8c4ff 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -5,7 +5,7 @@
5;; Author: Stefan Monnier <monnier@cs.yale.edu> 5;; Author: Stefan Monnier <monnier@cs.yale.edu>
6;; Keywords: pcl-cvs cvs status tree 6;; Keywords: pcl-cvs cvs status tree
7;; Version: $Name: $ 7;; Version: $Name: $
8;; Revision: $Id: cvs-status.el,v 1.3 2000/03/22 01:08:08 monnier Exp $ 8;; Revision: $Id: cvs-status.el,v 1.4 2000/05/10 22:08:28 monnier Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -283,8 +283,8 @@ BEWARE: because of stability issues, this is not a symetric operation."
283 (cvs-tree-merge tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2))))))))) 283 (cvs-tree-merge tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2)))))))))
284 284
285(defun cvs-tag-make-tag (tag) 285(defun cvs-tag-make-tag (tag)
286 (let ((vl (mapcar 'string-to-number (split-string (third tag) "\\.")))) 286 (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
287 (cvs-tag-make vl (first tag) (intern (second tag))))) 287 (cvs-tag-make vl (nth 0 tag) (intern (nth 1 tag)))))
288 288
289(defun cvs-tags->tree (tags) 289(defun cvs-tags->tree (tags)
290 "Make a tree out of a list of TAGS." 290 "Make a tree out of a list of TAGS."
@@ -425,9 +425,9 @@ Optional prefix ARG chooses between two representations."
425 ;;(pt (save-excursion (forward-line -1) (point))) 425 ;;(pt (save-excursion (forward-line -1) (point)))
426 ) 426 )
427 (setq tags (sort tags 'cvs-tag-lessp)) 427 (setq tags (sort tags 'cvs-tag-lessp))
428 (let* ((first (first tags)) 428 (let* ((first (nth 0 tags))
429 (prev (if (cvs-tag-p first) 429 (prev (if (cvs-tag-p first)
430 (list (first (cvs-tag->vlist first))) nil))) 430 (list (nth 0 (cvs-tag->vlist first))) nil)))
431 (cvs-tree-tags-insert tags prev) 431 (cvs-tree-tags-insert tags prev)
432 ;;(cvs-refontify pt (point)) 432 ;;(cvs-refontify pt (point))
433 (sit-for 0))))))) 433 (sit-for 0)))))))
@@ -505,6 +505,9 @@ Optional prefix ARG chooses between two representations."
505 505
506;;; Change Log: 506;;; Change Log:
507;; $Log: cvs-status.el,v $ 507;; $Log: cvs-status.el,v $
508;; Revision 1.4 2000/05/10 22:08:28 monnier
509;; (cvs-status-minor-wrap): Use mark-active.
510;;
508;; Revision 1.3 2000/03/22 01:08:08 monnier 511;; Revision 1.3 2000/03/22 01:08:08 monnier
509;; (cvs-status-mode): Use define-derived-mode. 512;; (cvs-status-mode): Use define-derived-mode.
510;; 513;;
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index e8b71a120bc..06a07583482 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -5,7 +5,7 @@
5;; Author: Stefan Monnier <monnier@cs.yale.edu> 5;; Author: Stefan Monnier <monnier@cs.yale.edu>
6;; Keywords: pcl-cvs 6;; Keywords: pcl-cvs
7;; Version: $Name: $ 7;; Version: $Name: $
8;; Revision: $Id: pcvs-util.el,v 1.2 2000/03/17 10:07:00 fx Exp $ 8;; Revision: $Id: pcvs-util.el,v 1.1 2000/08/05 19:33:53 gerd Exp gerd $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -314,7 +314,7 @@ See `cvs-prefix-set' for further description of the behavior."))
314 (unless (>= (length defaults) cvs-prefix-number) 314 (unless (>= (length defaults) cvs-prefix-number)
315 (setq defaults (append defaults 315 (setq defaults (append defaults
316 (make-list (1- cvs-prefix-number) 316 (make-list (1- cvs-prefix-number)
317 (first defaults))))) 317 (nth 0 defaults)))))
318 (-cvs-flags-make ,desc defaults ,qtypedesc ,hist-sym)))))) 318 (-cvs-flags-make ,desc defaults ,qtypedesc ,hist-sym))))))
319 319
320(defun cvs-prefix-make-local (sym) 320(defun cvs-prefix-make-local (sym)
@@ -347,7 +347,7 @@ If ARG is NIL toggle the PREFIX's value between its 0th default and NIL
347 (cond 347 (cond
348 ((null arg) 348 ((null arg)
349 (setf (cvs-flags-persist prefix) nil) 349 (setf (cvs-flags-persist prefix) nil)
350 (unless (symbol-value sym) (first (cvs-flags-defaults prefix)))) 350 (unless (symbol-value sym) (nth 0 (cvs-flags-defaults prefix))))
351 351
352 ((or (consp arg) (< numarg 0)) 352 ((or (consp arg) (< numarg 0))
353 (setf (nth (- numarg) (cvs-flags-defaults prefix)) 353 (setf (nth (- numarg) (cvs-flags-defaults prefix))
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 455d7028e8e..c61ce429932 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -14,7 +14,7 @@
14;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu 14;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu
15;; Keywords: CVS, version control, release management 15;; Keywords: CVS, version control, release management
16;; Version: $Name: $ 16;; Version: $Name: $
17;; Revision: $Id: pcvs.el,v 1.1 2000/08/05 19:28:18 gerd Exp gerd $ 17;; Revision: $Id: pcvs.el,v 1.6 2000/08/05 20:08:49 gerd Exp $
18 18
19;; This file is part of GNU Emacs. 19;; This file is part of GNU Emacs.
20 20
@@ -138,7 +138,7 @@
138(defun cvs-defaults (&rest defs) 138(defun cvs-defaults (&rest defs)
139 (let ((defs (cvs-first defs cvs-shared-start))) 139 (let ((defs (cvs-first defs cvs-shared-start)))
140 (append defs 140 (append defs
141 (make-list (- cvs-shared-start (length defs)) (first defs)) 141 (make-list (- cvs-shared-start (length defs)) (nth 0 defs))
142 cvs-shared-flags))) 142 cvs-shared-flags)))
143 143
144;; For cvs flags, we need to add "-f" to override the cvsrc settings 144;; For cvs flags, we need to add "-f" to override the cvsrc settings
@@ -338,8 +338,8 @@ information and will be read-only unless NORMAL is non-nil. It will be emptied
338from the current buffer." 338from the current buffer."
339 (let* ((cvs-buf (current-buffer)) 339 (let* ((cvs-buf (current-buffer))
340 (info (cdr (assoc cmd cvs-buffer-name-alist))) 340 (info (cdr (assoc cmd cvs-buffer-name-alist)))
341 (name (eval (first info))) 341 (name (eval (nth 0 info)))
342 (mode (second info)) 342 (mode (nth 1 info))
343 (dir default-directory) 343 (dir default-directory)
344 (buf (cond 344 (buf (cond
345 (name (cvs-get-buffer-create name)) 345 (name (cvs-get-buffer-create name))
@@ -496,9 +496,9 @@ Working dir: " (abbreviate-file-name dir) "
496 (fi (car fis) (car fis))) 496 (fi (car fis) (car fis)))
497 ((not (and fis (string= dir (cvs-fileinfo->dir fi)))) 497 ((not (and fis (string= dir (cvs-fileinfo->dir fi))))
498 (list dir files fis)))))) 498 (list dir files fis))))))
499 (dir (first dir+files+rest)) 499 (dir (nth 0 dir+files+rest))
500 (files (second dir+files+rest)) 500 (files (nth 1 dir+files+rest))
501 (rest (third dir+files+rest))) 501 (rest (nth 2 dir+files+rest)))
502 502
503 ;; setup the (current) process buffer 503 ;; setup the (current) process buffer
504 (set (make-local-variable 'cvs-postprocess) 504 (set (make-local-variable 'cvs-postprocess)
@@ -666,8 +666,8 @@ clear what alternative to use.
666 (cond 666 (cond
667 ;; a trivial interaction, no need to move it 667 ;; a trivial interaction, no need to move it
668 ((or (eq style 'SIMPLE) 668 ((or (eq style 'SIMPLE)
669 (null (second interact)) 669 (null (nth 1 interact))
670 (stringp (second interact))) 670 (stringp (nth 1 interact)))
671 `(defun ,fun ,args ,docstring ,interact 671 `(defun ,fun ,args ,docstring ,interact
672 (cvs-mode! (lambda () ,@body)))) 672 (cvs-mode! (lambda () ,@body))))
673 673
@@ -1301,7 +1301,7 @@ The POSTPROC specified there (typically `cvs-edit') is then called,
1301 (pop-to-buffer (cvs-temp-buffer "message" 'normal 'nosetup)) 1301 (pop-to-buffer (cvs-temp-buffer "message" 'normal 'nosetup))
1302 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap) 1302 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap)
1303 (let ((lbd list-buffers-directory) 1303 (let ((lbd list-buffers-directory)
1304 (setupfun (or (third (cdr (assoc "message" cvs-buffer-name-alist))) 1304 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
1305 'cvs-edit))) 1305 'cvs-edit)))
1306 (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist) 1306 (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist)
1307 (set (make-local-variable 'list-buffers-directory) lbd))) 1307 (set (make-local-variable 'list-buffers-directory) lbd)))
@@ -1540,12 +1540,12 @@ Signal an error if there is no backup file."
1540 (fis (cvs-mode-marked 'diff "idiff" :file t))) 1540 (fis (cvs-mode-marked 'diff "idiff" :file t)))
1541 (when (> (length fis) 2) 1541 (when (> (length fis) 2)
1542 (error "idiff-other cannot be applied to more than 2 files at a time.")) 1542 (error "idiff-other cannot be applied to more than 2 files at a time."))
1543 (let* ((fi1 (first fis)) 1543 (let* ((fi1 (nth 0 fis))
1544 (rev1-buf (if rev1 (cvs-retrieve-revision fi1 rev1) 1544 (rev1-buf (if rev1 (cvs-retrieve-revision fi1 rev1)
1545 (find-file-noselect (cvs-fileinfo->full-path fi1)))) 1545 (find-file-noselect (cvs-fileinfo->full-path fi1))))
1546 rev2-buf) 1546 rev2-buf)
1547 (if (cdr fis) 1547 (if (cdr fis)
1548 (let ((fi2 (second fis))) 1548 (let ((fi2 (nth 1 fis)))
1549 (setq rev2-buf 1549 (setq rev2-buf
1550 (if rev2 (cvs-retrieve-revision fi2 rev2) 1550 (if rev2 (cvs-retrieve-revision fi2 rev2)
1551 (find-file-noselect (cvs-fileinfo->full-path fi2))))) 1551 (find-file-noselect (cvs-fileinfo->full-path fi2)))))
@@ -1595,7 +1595,7 @@ POSTPROC is a list of expressions to be evaluated at the very end (after
1595 (member cmd cvs-execute-single-dir))) 1595 (member cmd cvs-execute-single-dir)))
1596 (parse (member cmd cvs-parse-known-commands)) 1596 (parse (member cmd cvs-parse-known-commands))
1597 (args (append cvsargs (list cmd) flags)) 1597 (args (append cvsargs (list cmd) flags))
1598 (after-mode (third (cdr (assoc cmd cvs-buffer-name-alist))))) 1598 (after-mode (nth 2 (cdr (assoc cmd cvs-buffer-name-alist)))))
1599 (cvs-cleanup-collection cvs-cookies ;cleanup remaining messages 1599 (cvs-cleanup-collection cvs-cookies ;cleanup remaining messages
1600 (eq cvs-auto-remove-handled 'delayed) nil t) 1600 (eq cvs-auto-remove-handled 'delayed) nil t)
1601 (when (fboundp after-mode) 1601 (when (fboundp after-mode)