2019-06-21 14:30:50 +00:00
|
|
|
;;; pcvs-util.el --- utility functions for PCL-CVS
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2020-01-01 00:19:43 +00:00
|
|
|
;; Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2006-04-30 15:49:08 +00:00
|
|
|
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
|
2000-03-11 03:51:31 +00:00
|
|
|
;; Keywords: pcl-cvs
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: pcvs
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-03-11 03:51:31 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;;;;
|
|
|
|
;;;; list processing
|
2000-11-06 06:54:16 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defsubst cvs-car (x) (if (consp x) (car x) x))
|
|
|
|
(defalias 'cvs-cdr 'cdr-safe)
|
|
|
|
(defsubst cvs-append (&rest xs)
|
|
|
|
(apply 'append (mapcar (lambda (x) (if (listp x) x (list x))) xs)))
|
|
|
|
|
|
|
|
(defsubst cvs-every (-cvs-every-f -cvs-every-l)
|
|
|
|
(while (consp -cvs-every-l)
|
|
|
|
(unless (funcall -cvs-every-f (pop -cvs-every-l))
|
|
|
|
(setq -cvs-every-l t)))
|
|
|
|
(not -cvs-every-l))
|
|
|
|
|
|
|
|
(defun cvs-union (xs ys)
|
|
|
|
(let ((zs ys))
|
|
|
|
(dolist (x xs zs)
|
|
|
|
(unless (member x ys) (push x zs)))))
|
2003-02-04 12:29:42 +00:00
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
(defun cvs-map (-cvs-map-f &rest -cvs-map-ls)
|
2008-04-07 14:25:02 +00:00
|
|
|
(let ((accum ()))
|
|
|
|
(while (not (cvs-every 'null -cvs-map-ls))
|
|
|
|
(push (apply -cvs-map-f (mapcar 'car -cvs-map-ls)) accum)
|
|
|
|
(setq -cvs-map-ls (mapcar 'cdr -cvs-map-ls)))
|
|
|
|
(nreverse accum)))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defun cvs-first (l &optional n)
|
|
|
|
(if (null n) (car l)
|
|
|
|
(when l
|
|
|
|
(let* ((nl (list (pop l)))
|
|
|
|
(ret nl))
|
|
|
|
(while (and l (> n 1))
|
|
|
|
(setcdr nl (list (pop l)))
|
|
|
|
(setq nl (cdr nl))
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
(cl-decf n))
|
2000-03-11 03:51:31 +00:00
|
|
|
ret))))
|
|
|
|
|
|
|
|
(defun cvs-partition (p l)
|
|
|
|
"Partition a list L into two lists based on predicate P.
|
|
|
|
The function returns a `cons' cell where the `car' contains
|
|
|
|
elements of L for which P is true while the `cdr' contains
|
|
|
|
the other elements. The ordering among elements is maintained."
|
|
|
|
(let (car cdr)
|
|
|
|
(dolist (x l)
|
|
|
|
(if (funcall p x) (push x car) (push x cdr)))
|
|
|
|
(cons (nreverse car) (nreverse cdr))))
|
|
|
|
|
2000-12-10 21:18:03 +00:00
|
|
|
;;;
|
|
|
|
;;; frame, window, buffer handling
|
|
|
|
;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defun cvs-pop-to-buffer-same-frame (buf)
|
|
|
|
"Pop to BUF like `pop-to-buffer' but staying on the same frame.
|
|
|
|
If `pop-to-buffer' would have opened a new frame, this function would
|
2000-12-10 21:18:03 +00:00
|
|
|
try to split a new window instead."
|
2000-03-11 03:51:31 +00:00
|
|
|
(let ((pop-up-windows (or pop-up-windows pop-up-frames))
|
|
|
|
(pop-up-frames nil))
|
|
|
|
(or (let ((buf (get-buffer-window buf))) (and buf (select-window buf)))
|
|
|
|
(and pop-up-windows
|
2011-10-30 01:56:03 +00:00
|
|
|
(ignore-errors (select-window (split-window-below)))
|
2011-11-20 20:17:46 +00:00
|
|
|
(switch-to-buffer buf nil 'force-same-window))
|
2000-03-11 03:51:31 +00:00
|
|
|
(pop-to-buffer (current-buffer)))))
|
|
|
|
|
|
|
|
(defun cvs-bury-buffer (buf &optional mainbuf)
|
|
|
|
"Hide the buffer BUF that was temporarily popped up.
|
|
|
|
BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
|
|
|
|
(interactive (list (current-buffer)))
|
|
|
|
(save-current-buffer
|
Do not call to `selected-window' where it is assumed by default.
Affected functions are `window-minibuffer-p', `window-dedicated-p',
`window-hscroll', `window-width', `window-height', `window-buffer',
`window-frame', `window-start', `window-point', `next-window'
and `window-display-table'.
* abbrev.el (abbrev--default-expand):
* bs.el (bs--show-with-configuration):
* buff-menu.el (Buffer-menu-mouse-select):
* calc/calc.el (calc):
* calendar/calendar.el (calendar-generate-window):
* calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
(diary-make-entry):
* comint.el (send-invisible, comint-dynamic-complete-filename)
(comint-dynamic-simple-complete, comint-dynamic-list-completions):
* completion.el (complete):
* dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
* disp-table.el (describe-current-display-table):
* doc-view.el (doc-view-insert-image):
* ebuff-menu.el (Electric-buffer-menu-mouse-select):
* ehelp.el (with-electric-help):
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
* emacs-lisp/helper.el (Helper-help-scroller):
* emulation/cua-base.el (cua--post-command-handler-1):
* eshell/esh-mode.el (eshell-output-filter):
* ffap.el (ffap-gnus-wrapper):
* help-macro.el (make-help-screen):
* hilit-chg.el (highlight-compare-buffers):
* hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
* hl-line.el (global-hl-line-highlight):
* icomplete.el (icomplete-simple-completing-p):
* isearch.el (isearch-done):
* jit-lock.el (jit-lock-stealth-fontify):
* mail/rmailsum.el (rmail-summary-scroll-msg-up):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* mpc.el (mpc-tagbrowser, mpc):
* net/rcirc.el (rcirc-any-buffer):
* play/gomoku.el (gomoku-max-width, gomoku-max-height):
* play/landmark.el (landmark-max-width, landmark-max-height):
* play/zone.el (zone):
* progmodes/compile.el (compilation-goto-locus):
* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
* progmodes/etags.el (find-tag-other-window):
* progmodes/fortran.el (fortran-column-ruler):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/verilog-mode.el (verilog-point-text):
* reposition.el (reposition-window):
* rot13.el (toggle-rot13-mode):
* server.el (server-switch-buffer):
* shell.el (shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable):
* simple.el (insert-buffer, set-selective-display)
(delete-completion-window):
* speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
(speedbar-recenter):
* startup.el (fancy-splash-head):
* textmodes/ispell.el (ispell-command-loop):
* textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
* tutorial.el (help-with-tutorial):
* vc/add-log.el (add-change-log-entry):
* vc/compare-w.el (compare-windows):
* vc/ediff-help.el (ediff-indent-help-message):
* vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
* vc/ediff-wind.el (ediff-skip-unsuitable-frames)
(ediff-setup-control-frame):
* vc/emerge.el (emerge-position-region):
* vc/pcvs-util.el (cvs-bury-buffer):
* window.el (walk-windows, mouse-autoselect-window-select):
* winner.el (winner-set-conf, winner-undo): Related users changed.
2013-08-05 14:26:57 +00:00
|
|
|
(let ((win (if (eq buf (window-buffer)) (selected-window)
|
2000-03-11 03:51:31 +00:00
|
|
|
(get-buffer-window buf t))))
|
|
|
|
(when win
|
2008-05-08 14:51:03 +00:00
|
|
|
(if (window-dedicated-p win)
|
|
|
|
(condition-case ()
|
|
|
|
(delete-window win)
|
|
|
|
(error (iconify-frame (window-frame win))))
|
|
|
|
;;; (if (and mainbuf (get-buffer-window mainbuf))
|
|
|
|
;;; ;; FIXME: if the buffer popped into a pre-existing window,
|
|
|
|
;;; ;; we don't want to delete that window.
|
|
|
|
;;; t ;;(delete-window win)
|
|
|
|
;;; )
|
|
|
|
)))
|
|
|
|
(with-current-buffer buf
|
Do not call to `selected-window' where it is assumed by default.
Affected functions are `window-minibuffer-p', `window-dedicated-p',
`window-hscroll', `window-width', `window-height', `window-buffer',
`window-frame', `window-start', `window-point', `next-window'
and `window-display-table'.
* abbrev.el (abbrev--default-expand):
* bs.el (bs--show-with-configuration):
* buff-menu.el (Buffer-menu-mouse-select):
* calc/calc.el (calc):
* calendar/calendar.el (calendar-generate-window):
* calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
(diary-make-entry):
* comint.el (send-invisible, comint-dynamic-complete-filename)
(comint-dynamic-simple-complete, comint-dynamic-list-completions):
* completion.el (complete):
* dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
* disp-table.el (describe-current-display-table):
* doc-view.el (doc-view-insert-image):
* ebuff-menu.el (Electric-buffer-menu-mouse-select):
* ehelp.el (with-electric-help):
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
* emacs-lisp/helper.el (Helper-help-scroller):
* emulation/cua-base.el (cua--post-command-handler-1):
* eshell/esh-mode.el (eshell-output-filter):
* ffap.el (ffap-gnus-wrapper):
* help-macro.el (make-help-screen):
* hilit-chg.el (highlight-compare-buffers):
* hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
* hl-line.el (global-hl-line-highlight):
* icomplete.el (icomplete-simple-completing-p):
* isearch.el (isearch-done):
* jit-lock.el (jit-lock-stealth-fontify):
* mail/rmailsum.el (rmail-summary-scroll-msg-up):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* mpc.el (mpc-tagbrowser, mpc):
* net/rcirc.el (rcirc-any-buffer):
* play/gomoku.el (gomoku-max-width, gomoku-max-height):
* play/landmark.el (landmark-max-width, landmark-max-height):
* play/zone.el (zone):
* progmodes/compile.el (compilation-goto-locus):
* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
* progmodes/etags.el (find-tag-other-window):
* progmodes/fortran.el (fortran-column-ruler):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/verilog-mode.el (verilog-point-text):
* reposition.el (reposition-window):
* rot13.el (toggle-rot13-mode):
* server.el (server-switch-buffer):
* shell.el (shell-dynamic-complete-command)
(shell-dynamic-complete-environment-variable):
* simple.el (insert-buffer, set-selective-display)
(delete-completion-window):
* speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
(speedbar-recenter):
* startup.el (fancy-splash-head):
* textmodes/ispell.el (ispell-command-loop):
* textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
* tutorial.el (help-with-tutorial):
* vc/add-log.el (add-change-log-entry):
* vc/compare-w.el (compare-windows):
* vc/ediff-help.el (ediff-indent-help-message):
* vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
* vc/ediff-wind.el (ediff-skip-unsuitable-frames)
(ediff-setup-control-frame):
* vc/emerge.el (emerge-position-region):
* vc/pcvs-util.el (cvs-bury-buffer):
* window.el (walk-windows, mouse-autoselect-window-select):
* winner.el (winner-set-conf, winner-undo): Related users changed.
2013-08-05 14:26:57 +00:00
|
|
|
(bury-buffer (unless (and (eq buf (window-buffer))
|
|
|
|
(not (window-dedicated-p)))
|
2008-05-08 14:51:03 +00:00
|
|
|
buf)))
|
2000-03-11 03:51:31 +00:00
|
|
|
(when mainbuf
|
|
|
|
(let ((mainwin (or (get-buffer-window mainbuf)
|
|
|
|
(get-buffer-window mainbuf 'visible))))
|
|
|
|
(when mainwin (select-window mainwin))))))
|
2003-02-04 12:29:42 +00:00
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
(defun cvs-get-buffer-create (name &optional noreuse)
|
|
|
|
"Create a buffer NAME unless such a buffer already exists.
|
|
|
|
If the NAME looks like an absolute file name, the buffer will be created
|
|
|
|
with `create-file-buffer' and will probably get another name than NAME.
|
|
|
|
In such a case, the search for another buffer with the same name doesn't
|
|
|
|
use the buffer name but the buffer's `list-buffers-directory' variable.
|
|
|
|
If NOREUSE is non-nil, always return a new buffer."
|
2006-08-02 14:14:19 +00:00
|
|
|
(or (and (not (file-name-absolute-p name))
|
|
|
|
(if noreuse (generate-new-buffer name)
|
|
|
|
(get-buffer-create name)))
|
2000-03-11 03:51:31 +00:00
|
|
|
(unless noreuse
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
(cl-dolist (buf (buffer-list))
|
2000-03-11 03:51:31 +00:00
|
|
|
(with-current-buffer buf
|
|
|
|
(when (equal name list-buffers-directory)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
(cl-return buf)))))
|
2000-03-11 03:51:31 +00:00
|
|
|
(with-current-buffer (create-file-buffer name)
|
2009-09-25 04:35:14 +00:00
|
|
|
(setq list-buffers-directory name)
|
2000-03-11 03:51:31 +00:00
|
|
|
(current-buffer))))
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
;;;; string processing
|
|
|
|
;;;;
|
|
|
|
|
2000-11-06 06:54:16 +00:00
|
|
|
(defun cvs-insert-strings (strings)
|
|
|
|
"Insert a list of STRINGS into the current buffer.
|
|
|
|
Uses columns to keep the listing readable but compact."
|
|
|
|
(when (consp strings)
|
|
|
|
(let* ((length (apply 'max (mapcar 'length strings)))
|
|
|
|
(wwidth (1- (window-width)))
|
|
|
|
(columns (min
|
|
|
|
;; At least 2 columns; at least 2 spaces between columns.
|
|
|
|
(max 2 (/ wwidth (+ 2 length)))
|
|
|
|
;; Don't allocate more columns than we can fill.
|
2001-04-13 14:56:10 +00:00
|
|
|
;; Windows can't show less than 3 lines anyway.
|
2000-11-06 06:54:16 +00:00
|
|
|
(max 1 (/ (length strings) 2))))
|
|
|
|
(colwidth (/ wwidth columns)))
|
2001-04-13 14:56:10 +00:00
|
|
|
;; Use tab-width rather than indent-to.
|
2000-11-06 06:54:16 +00:00
|
|
|
(setq tab-width colwidth)
|
|
|
|
;; The insertion should be "sensible" no matter what choices were made.
|
|
|
|
(dolist (str strings)
|
2006-03-31 21:33:03 +00:00
|
|
|
(unless (bolp)
|
|
|
|
(insert " \t")
|
|
|
|
(when (< wwidth (+ (max colwidth (length str)) (current-column)))
|
|
|
|
(delete-char -2) (insert "\n")))
|
|
|
|
(insert str)))))
|
2000-11-06 06:54:16 +00:00
|
|
|
|
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
(defun cvs-file-to-string (file &optional oneline args)
|
|
|
|
"Read the content of FILE and return it as a string.
|
|
|
|
If ONELINE is t, only the first line (no \\n) will be returned.
|
|
|
|
If ARGS is non-nil, the file will be executed with ARGS as its
|
|
|
|
arguments. If ARGS is not a list, no argument will be passed."
|
2001-12-02 07:41:47 +00:00
|
|
|
(condition-case nil
|
|
|
|
(with-temp-buffer
|
|
|
|
(if args
|
|
|
|
(apply 'call-process
|
|
|
|
file nil t nil (when (listp args) args))
|
|
|
|
(insert-file-contents file))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(buffer-substring (point)
|
|
|
|
(if oneline (line-end-position) (point-max))))
|
|
|
|
(file-error nil)))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2012-08-15 16:29:11 +00:00
|
|
|
(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.3")
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2003-02-04 12:29:42 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
;;;; file names
|
2003-02-04 12:29:42 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defsubst cvs-expand-dir-name (d)
|
|
|
|
(file-name-as-directory (expand-file-name d)))
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
;;;; (interactive <foo>) support function
|
|
|
|
;;;;
|
|
|
|
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
(cl-defstruct (cvs-qtypedesc
|
|
|
|
(:constructor nil) (:copier nil)
|
|
|
|
(:constructor cvs-qtypedesc-create
|
|
|
|
(str2obj obj2str &optional complete hist-sym require)))
|
2000-03-11 03:51:31 +00:00
|
|
|
str2obj
|
|
|
|
obj2str
|
|
|
|
hist-sym
|
|
|
|
complete
|
|
|
|
require)
|
|
|
|
|
|
|
|
|
|
|
|
(defconst cvs-qtypedesc-string1 (cvs-qtypedesc-create 'identity 'identity t))
|
|
|
|
(defconst cvs-qtypedesc-string (cvs-qtypedesc-create 'identity 'identity))
|
|
|
|
(defconst cvs-qtypedesc-strings
|
2007-08-12 18:00:34 +00:00
|
|
|
(cvs-qtypedesc-create 'split-string-and-unquote
|
|
|
|
'combine-and-quote-strings nil))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defun cvs-query-read (default prompt qtypedesc &optional hist-sym)
|
|
|
|
(let* ((qtypedesc (or qtypedesc cvs-qtypedesc-strings))
|
|
|
|
(hist-sym (or hist-sym (cvs-qtypedesc-hist-sym qtypedesc)))
|
|
|
|
(complete (cvs-qtypedesc-complete qtypedesc))
|
|
|
|
(completions (and (functionp complete) (funcall complete)))
|
|
|
|
(initval (funcall (cvs-qtypedesc-obj2str qtypedesc) default)))
|
|
|
|
(funcall (cvs-qtypedesc-str2obj qtypedesc)
|
|
|
|
(cond
|
|
|
|
((null complete) (read-string prompt initval hist-sym))
|
|
|
|
((functionp complete)
|
|
|
|
(completing-read prompt completions
|
|
|
|
nil (cvs-qtypedesc-require qtypedesc)
|
|
|
|
initval hist-sym))
|
|
|
|
(t initval)))))
|
|
|
|
|
2003-02-04 12:29:42 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
;;;; Flags handling
|
2003-02-04 12:29:42 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
(cl-defstruct (cvs-flags
|
|
|
|
(:constructor nil)
|
|
|
|
(:constructor -cvs-flags-make
|
|
|
|
(desc defaults &optional qtypedesc hist-sym)))
|
2000-03-11 03:51:31 +00:00
|
|
|
defaults persist desc qtypedesc hist-sym)
|
|
|
|
|
|
|
|
(defmacro cvs-flags-define (sym defaults
|
|
|
|
&optional desc qtypedesc hist-sym docstring)
|
|
|
|
`(defconst ,sym
|
|
|
|
(let ((bound (boundp ',sym)))
|
|
|
|
(if (and bound (cvs-flags-p ,sym)) ,sym
|
|
|
|
(let ((defaults ,defaults))
|
|
|
|
(-cvs-flags-make ,desc
|
|
|
|
(if bound (cons ,sym (cdr defaults)) defaults)
|
|
|
|
,qtypedesc ,hist-sym))))
|
|
|
|
,docstring))
|
|
|
|
|
|
|
|
(defun cvs-flags-query (sym &optional desc arg)
|
|
|
|
"Query flags based on SYM.
|
2005-07-20 20:51:27 +00:00
|
|
|
Optional argument DESC will be used for the prompt.
|
2000-03-11 03:51:31 +00:00
|
|
|
If ARG (or a prefix argument) is nil, just use the 0th default.
|
|
|
|
If it is a non-negative integer, use the corresponding default.
|
lisp/vc/pcvs*.el: Fix typos.
* lisp/vc/pcvs-defs.el (cvs-auto-remove-handled)
(cvs-auto-remove-directories, cvs-default-ignore-marks)
(cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer)
(cvs-execute-single-dir): Fix docstring typos.
* lisp/vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos.
(cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes.
* lisp/vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring.
* lisp/vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set):
Fix docstring typos.
* lisp/vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot)
(cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark)
(cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday)
(cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot)
(cvs-dired-use-hook): Fix docstring typos.
(cvs-mode-view-file-other-window, cvs-mode-byte-compile-files):
Doc fixes.
2014-03-12 04:00:03 +00:00
|
|
|
If it is a negative integer, query for a new value of the corresponding
|
2000-03-11 03:51:31 +00:00
|
|
|
default and return that new value.
|
|
|
|
If it is \\[universal-argument], just query and return a value without
|
|
|
|
altering the defaults.
|
|
|
|
If it is \\[universal-argument] \\[universal-argument], behave just
|
|
|
|
as if a negative zero was provided."
|
|
|
|
(let* ((flags (symbol-value sym))
|
|
|
|
(desc (or desc (cvs-flags-desc flags)))
|
|
|
|
(qtypedesc (cvs-flags-qtypedesc flags))
|
|
|
|
(hist-sym (cvs-flags-hist-sym flags))
|
|
|
|
(arg (if (eq arg 'noquery) 0 (or arg current-prefix-arg 0)))
|
|
|
|
(numarg (prefix-numeric-value arg))
|
|
|
|
(defaults (cvs-flags-defaults flags))
|
|
|
|
(permstr (if (< numarg 0) (format " (%sth default)" (- numarg)))))
|
|
|
|
;; special case for universal-argument
|
|
|
|
(when (consp arg)
|
|
|
|
(setq permstr (if (> numarg 4) " (permanent)" ""))
|
|
|
|
(setq numarg 0))
|
|
|
|
|
|
|
|
;; sanity check
|
|
|
|
(unless (< (abs numarg) (length defaults))
|
2001-07-16 07:46:48 +00:00
|
|
|
(error "There is no %sth default" (abs numarg)))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(if permstr
|
|
|
|
(let* ((prompt (format "%s%s: " desc permstr))
|
|
|
|
(fs (cvs-query-read (nth (- numarg) (cvs-flags-defaults flags))
|
|
|
|
prompt qtypedesc hist-sym)))
|
|
|
|
(when (not (equal permstr ""))
|
|
|
|
(setf (nth (- numarg) (cvs-flags-defaults flags)) fs))
|
|
|
|
fs)
|
|
|
|
(nth numarg defaults))))
|
|
|
|
|
|
|
|
(defsubst cvs-flags-set (sym index value)
|
lisp/vc/pcvs*.el: Fix typos.
* lisp/vc/pcvs-defs.el (cvs-auto-remove-handled)
(cvs-auto-remove-directories, cvs-default-ignore-marks)
(cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer)
(cvs-execute-single-dir): Fix docstring typos.
* lisp/vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos.
(cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes.
* lisp/vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring.
* lisp/vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set):
Fix docstring typos.
* lisp/vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot)
(cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark)
(cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday)
(cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot)
(cvs-dired-use-hook): Fix docstring typos.
(cvs-mode-view-file-other-window, cvs-mode-byte-compile-files):
Doc fixes.
2014-03-12 04:00:03 +00:00
|
|
|
"Set SYM's INDEXth setting to VALUE."
|
2000-03-11 03:51:31 +00:00
|
|
|
(setf (nth index (cvs-flags-defaults (symbol-value sym))) value))
|
|
|
|
|
2003-02-04 12:29:42 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
;;;; Prefix keys
|
2003-02-04 12:29:42 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defconst cvs-prefix-number 10)
|
|
|
|
|
|
|
|
(defsubst cvs-prefix-sym (sym) (intern (concat (symbol-name sym) "-cps")))
|
|
|
|
|
|
|
|
(defmacro cvs-prefix-define (sym docstring desc defaults
|
|
|
|
&optional qtypedesc hist-sym)
|
|
|
|
(let ((cps (cvs-prefix-sym sym)))
|
|
|
|
`(progn
|
2001-10-03 20:32:19 +00:00
|
|
|
(defvar ,sym nil ,(concat (or docstring "") "
|
2000-03-11 03:51:31 +00:00
|
|
|
See `cvs-prefix-set' for further description of the behavior."))
|
2001-11-17 00:48:14 +00:00
|
|
|
(defvar ,cps
|
2000-03-11 03:51:31 +00:00
|
|
|
(let ((defaults ,defaults))
|
2011-11-17 09:09:20 +00:00
|
|
|
;; sanity insurance
|
2000-03-11 03:51:31 +00:00
|
|
|
(unless (>= (length defaults) cvs-prefix-number)
|
|
|
|
(setq defaults (append defaults
|
|
|
|
(make-list (1- cvs-prefix-number)
|
2000-08-06 09:18:02 +00:00
|
|
|
(nth 0 defaults)))))
|
2000-03-11 03:51:31 +00:00
|
|
|
(-cvs-flags-make ,desc defaults ,qtypedesc ,hist-sym))))))
|
|
|
|
|
|
|
|
(defun cvs-prefix-make-local (sym)
|
|
|
|
(let ((cps (cvs-prefix-sym sym)))
|
|
|
|
(make-local-variable sym)
|
|
|
|
(set (make-local-variable cps) (copy-cvs-flags (symbol-value cps)))))
|
|
|
|
|
|
|
|
(defun cvs-prefix-set (sym arg)
|
|
|
|
;; we could distinguish between numeric and non-numeric prefix args instead of
|
|
|
|
;; relying on that magic `4'.
|
|
|
|
"Set the cvs-prefix contained in SYM.
|
|
|
|
If ARG is between 0 and 9, it selects the corresponding default.
|
|
|
|
If ARG is negative (or \\[universal-argument] which corresponds to negative 0),
|
lisp/vc/pcvs*.el: Fix typos.
* lisp/vc/pcvs-defs.el (cvs-auto-remove-handled)
(cvs-auto-remove-directories, cvs-default-ignore-marks)
(cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer)
(cvs-execute-single-dir): Fix docstring typos.
* lisp/vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos.
(cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes.
* lisp/vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring.
* lisp/vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set):
Fix docstring typos.
* lisp/vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot)
(cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark)
(cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday)
(cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot)
(cvs-dired-use-hook): Fix docstring typos.
(cvs-mode-view-file-other-window, cvs-mode-byte-compile-files):
Doc fixes.
2014-03-12 04:00:03 +00:00
|
|
|
it queries the user and sets the -ARGth default.
|
2000-03-11 03:51:31 +00:00
|
|
|
If ARG is greater than 9 (or \\[universal-argument] \\[universal-argument]),
|
|
|
|
the (ARG mod 10)'th prefix is made persistent.
|
2001-12-20 18:59:32 +00:00
|
|
|
If ARG is nil toggle the PREFIX's value between its 0th default and nil
|
2000-03-11 03:51:31 +00:00
|
|
|
and reset the persistence."
|
|
|
|
(let* ((prefix (symbol-value (cvs-prefix-sym sym)))
|
|
|
|
(numarg (if (integerp arg) arg 0))
|
2006-03-31 21:33:03 +00:00
|
|
|
;; (defs (cvs-flags-defaults prefix))
|
|
|
|
)
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;; set persistence if requested
|
|
|
|
(when (> (prefix-numeric-value arg) 9)
|
|
|
|
(setf (cvs-flags-persist prefix) t)
|
|
|
|
(setq numarg (mod numarg 10)))
|
|
|
|
|
|
|
|
;; set the value
|
|
|
|
(set sym
|
|
|
|
(cond
|
|
|
|
((null arg)
|
|
|
|
(setf (cvs-flags-persist prefix) nil)
|
2000-08-06 09:18:02 +00:00
|
|
|
(unless (symbol-value sym) (nth 0 (cvs-flags-defaults prefix))))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
((or (consp arg) (< numarg 0))
|
|
|
|
(setf (nth (- numarg) (cvs-flags-defaults prefix))
|
|
|
|
(cvs-query-read (nth (- numarg) (cvs-flags-defaults prefix))
|
|
|
|
(format "%s: " (cvs-flags-desc prefix))
|
|
|
|
(cvs-flags-qtypedesc prefix)
|
|
|
|
(cvs-flags-hist-sym prefix))))
|
|
|
|
(t (nth numarg (cvs-flags-defaults prefix)))))
|
|
|
|
(force-mode-line-update)))
|
|
|
|
|
|
|
|
(defun cvs-prefix-get (sym &optional read-only)
|
|
|
|
"Return the current value of the prefix SYM.
|
2005-07-20 20:51:27 +00:00
|
|
|
And reset it unless READ-ONLY is non-nil."
|
2000-03-11 03:51:31 +00:00
|
|
|
(prog1 (symbol-value sym)
|
|
|
|
(unless (or read-only
|
|
|
|
(cvs-flags-persist (symbol-value (cvs-prefix-sym sym))))
|
|
|
|
(set sym nil)
|
|
|
|
(force-mode-line-update))))
|
|
|
|
|
|
|
|
(provide 'pcvs-util)
|
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; pcvs-util.el ends here
|