diff options
| author | Eric S. Raymond | 2008-05-05 18:17:09 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2008-05-05 18:17:09 +0000 |
| commit | 038608c7ad2be31419caa4bb10874df1d206e7de (patch) | |
| tree | c3066bcc4c923c9d45bbe82a10745dbb29ab2ed5 | |
| parent | 1ef5eecc2fb635c6aae55c0e7634d7b4f8ae605a (diff) | |
| download | emacs-038608c7ad2be31419caa4bb10874df1d206e7de.tar.gz emacs-038608c7ad2be31419caa4bb10874df1d206e7de.zip | |
Avoid passing default nil argument.
| -rw-r--r-- | lisp/vc-dispatcher.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index 584eb8091a2..b2484ec6b75 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el | |||
| @@ -76,17 +76,18 @@ | |||
| 76 | 76 | ||
| 77 | ;; Special behavior of dispatcher directory buffers: | 77 | ;; Special behavior of dispatcher directory buffers: |
| 78 | ;; | 78 | ;; |
| 79 | ;; In dispatcher directory buffers, faciltiies to perform basic | 79 | ;; In dispatcher directory buffers, facilities to perform basic |
| 80 | ;; navigation and selection operations are provided by keymap and menu | 80 | ;; navigation and selection operations are provided by keymap and menu |
| 81 | ;; entries that dispatcher sets up itself, so they'll be uniform | 81 | ;; entries that dispatcher sets up itself, so they'll be uniform |
| 82 | ;; across all dispatcher- using client modes. Client modes are | 82 | ;; across all dispatcher-using client modes. Client modes are |
| 83 | ;; expected to append to these to provide mode-specific bindings. | 83 | ;; expected to append to these to provide mode-specific bindings. |
| 84 | ;; | 84 | ;; |
| 85 | ;; The standard map associates a 'state' slot (that the client mode | 85 | ;; The standard map associates a 'state' slot (that the client mode |
| 86 | ;; may set) with each directory entry. The dispatcher knows nothing | 86 | ;; may set) with each directory entry. The dispatcher knows nothing |
| 87 | ;; about the semantics of individual states, but mark and unmark commands | 87 | ;; about the semantics of individual states, but mark and unmark commands |
| 88 | ;; treat all entries with the same state | 88 | ;; treat all entries with the same state as the currently selected one as |
| 89 | 89 | ;; a unit. | |
| 90 | |||
| 90 | ;; To do: | 91 | ;; To do: |
| 91 | ;; | 92 | ;; |
| 92 | ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, | 93 | ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, |
| @@ -1531,7 +1532,7 @@ that share the same state." | |||
| 1531 | (setq crt (ewoc-next vc-ewoc crt))) | 1532 | (setq crt (ewoc-next vc-ewoc crt))) |
| 1532 | (setq crt (ewoc-next vc-ewoc crt))))) | 1533 | (setq crt (ewoc-next vc-ewoc crt))))) |
| 1533 | result)) | 1534 | result)) |
| 1534 | 1535 | ||
| 1535 | (defun vc-dir-mark-buffer-changed (&optional fname) | 1536 | (defun vc-dir-mark-buffer-changed (&optional fname) |
| 1536 | (let* ((file (or fname (expand-file-name buffer-file-name))) | 1537 | (let* ((file (or fname (expand-file-name buffer-file-name))) |
| 1537 | (found-vc-dir-buf nil)) | 1538 | (found-vc-dir-buf nil)) |
| @@ -1548,10 +1549,10 @@ that share the same state." | |||
| 1548 | ((file-short (substring file (length ddir))) | 1549 | ((file-short (substring file (length ddir))) |
| 1549 | (state | 1550 | (state |
| 1550 | (funcall (vc-client-object->file-to-state vc-client-mode) | 1551 | (funcall (vc-client-object->file-to-state vc-client-mode) |
| 1551 | fname)) | 1552 | file)) |
| 1552 | (extra | 1553 | (extra |
| 1553 | (funcall (vc-client-object->file-to-extra vc-client-mode) | 1554 | (funcall (vc-client-object->file-to-extra vc-client-mode) |
| 1554 | fname)) | 1555 | file)) |
| 1555 | (entry | 1556 | (entry |
| 1556 | (list file-short state extra))) | 1557 | (list file-short state extra))) |
| 1557 | (vc-dir-update (list entry) status-buf)))))) | 1558 | (vc-dir-update (list entry) status-buf)))))) |