diff options
| author | Glenn Morris | 2008-04-01 02:58:32 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-04-01 02:58:32 +0000 |
| commit | aafb0703bfb213ccabf492ad518b6882aac6cb33 (patch) | |
| tree | 9e56c961ad7b6a5304be7de265a9403625905037 | |
| parent | bbe3eb999f981baebe8db48ae702653ad2ff5cc6 (diff) | |
| download | emacs-aafb0703bfb213ccabf492ad518b6882aac6cb33.tar.gz emacs-aafb0703bfb213ccabf492ad518b6882aac6cb33.zip | |
(vc-responsible-backend): Declare as function.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf2e732e82d..1d7f1108dd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-04-01 Glenn Morris <rgm@gnu.org> | 1 | 2008-04-01 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * vc-hooks.el (vc-responsible-backend): Declare as function. | ||
| 4 | |||
| 3 | * calendar/calendar.el (calendar-nongregorian-visible-p): New function. | 5 | * calendar/calendar.el (calendar-nongregorian-visible-p): New function. |
| 4 | * calendar/cal-hebrew.el (calendar-hebrew-date-is-visible-p): | 6 | * calendar/cal-hebrew.el (calendar-hebrew-date-is-visible-p): |
| 5 | * calendar/cal-julian.el (holiday-julian): Use it. | 7 | * calendar/cal-julian.el (holiday-julian): Use it. |
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 893b16db601..05adcd5c6aa 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -6,8 +6,6 @@ | |||
| 6 | ;; Author: FSF (see vc.el for full credits) | 6 | ;; Author: FSF (see vc.el for full credits) |
| 7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 8 | 8 | ||
| 9 | ;; $Id$ | ||
| 10 | |||
| 11 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 12 | 10 | ||
| 13 | ;; GNU Emacs is free software; you can redistribute it and/or modify | 11 | ;; GNU Emacs is free software; you can redistribute it and/or modify |
| @@ -1060,12 +1058,14 @@ Used in `find-file-not-found-functions'." | |||
| 1060 | 1058 | ||
| 1061 | (defalias 'vc-menu-map vc-menu-map) | 1059 | (defalias 'vc-menu-map vc-menu-map) |
| 1062 | 1060 | ||
| 1061 | (declare-function vc-responsible-backend "vc" (file &optional register)) | ||
| 1062 | |||
| 1063 | (defun vc-menu-map-filter (orig-binding) | 1063 | (defun vc-menu-map-filter (orig-binding) |
| 1064 | (if (and (symbolp orig-binding) (fboundp orig-binding)) | 1064 | (if (and (symbolp orig-binding) (fboundp orig-binding)) |
| 1065 | (setq orig-binding (indirect-function orig-binding))) | 1065 | (setq orig-binding (indirect-function orig-binding))) |
| 1066 | (let ((ext-binding | 1066 | (let ((ext-binding |
| 1067 | (when vc-mode | 1067 | (when vc-mode |
| 1068 | (vc-call-backend | 1068 | (vc-call-backend |
| 1069 | (if buffer-file-name | 1069 | (if buffer-file-name |
| 1070 | (vc-backend buffer-file-name) | 1070 | (vc-backend buffer-file-name) |
| 1071 | (vc-responsible-backend default-directory)) | 1071 | (vc-responsible-backend default-directory)) |