diff options
| author | Romain Francoise | 2006-08-13 17:05:12 +0000 |
|---|---|---|
| committer | Romain Francoise | 2006-08-13 17:05:12 +0000 |
| commit | e1a2960c0722989a844750468f748fca71bc65da (patch) | |
| tree | 91ac89aa27649d8e6e07009d673516df8b804af9 | |
| parent | 43db7b94c9f8fbb48c444149c47cc9e9fd1fe8d2 (diff) | |
| download | emacs-e1a2960c0722989a844750468f748fca71bc65da.tar.gz emacs-e1a2960c0722989a844750468f748fca71bc65da.zip | |
* cus-theme.el (customize-create-theme)
(custom-theme-visit-theme): End `y-or-n-p' prompt with a space.
* filesets.el (filesets-add-buffer): Ditto.
* pcvs.el (cvs-change-cvsroot): Ditto.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/cus-theme.el | 6 | ||||
| -rw-r--r-- | lisp/filesets.el | 2 | ||||
| -rw-r--r-- | lisp/pcvs.el | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c9cfaff72a..4e44ebd5fbc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2006-08-13 Romain Francoise <romain@orebokech.com> | ||
| 2 | |||
| 3 | * cus-theme.el (customize-create-theme) | ||
| 4 | (custom-theme-visit-theme): End `y-or-n-p' prompt with a space. | ||
| 5 | |||
| 6 | * filesets.el (filesets-add-buffer): Ditto. | ||
| 7 | |||
| 8 | * pcvs.el (cvs-change-cvsroot): Ditto. | ||
| 9 | |||
| 1 | 2006-08-13 Nick Roberts <nickrob@snap.net.nz> | 10 | 2006-08-13 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 11 | ||
| 3 | * progmodes/gdb-ui.el (gdb-frame-separate-io-buffer) | 12 | * progmodes/gdb-ui.el (gdb-frame-separate-io-buffer) |
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index 53f530505ae..b4fe1e4b0bf 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el | |||
| @@ -99,7 +99,7 @@ the directory " custom-theme-directory "\n\n") | |||
| 99 | (widget-insert " ") | 99 | (widget-insert " ") |
| 100 | (widget-create 'push-button | 100 | (widget-create 'push-button |
| 101 | :notify (lambda (&rest ignore) | 101 | :notify (lambda (&rest ignore) |
| 102 | (when (y-or-n-p "Discard current changes?") | 102 | (when (y-or-n-p "Discard current changes? ") |
| 103 | (kill-buffer (current-buffer)) | 103 | (kill-buffer (current-buffer)) |
| 104 | (customize-create-theme))) | 104 | (customize-create-theme))) |
| 105 | "Reset Buffer") | 105 | "Reset Buffer") |
| @@ -137,7 +137,7 @@ the directory " custom-theme-directory "\n\n") | |||
| 137 | (widget-insert "\n") | 137 | (widget-insert "\n") |
| 138 | (widget-create 'push-button | 138 | (widget-create 'push-button |
| 139 | :notify (lambda (&rest ignore) | 139 | :notify (lambda (&rest ignore) |
| 140 | (when (y-or-n-p "Discard current changes?") | 140 | (when (y-or-n-p "Discard current changes? ") |
| 141 | (kill-buffer (current-buffer)) | 141 | (kill-buffer (current-buffer)) |
| 142 | (customize-create-theme))) | 142 | (customize-create-theme))) |
| 143 | "Reset Buffer") | 143 | "Reset Buffer") |
| @@ -290,7 +290,7 @@ Optional EVENT is the location for the menu." | |||
| 290 | (defun custom-theme-visit-theme () | 290 | (defun custom-theme-visit-theme () |
| 291 | (interactive) | 291 | (interactive) |
| 292 | (when (or (null custom-theme-variables) | 292 | (when (or (null custom-theme-variables) |
| 293 | (if (y-or-n-p "Discard current changes?") | 293 | (if (y-or-n-p "Discard current changes? ") |
| 294 | (progn (customize-create-theme) t))) | 294 | (progn (customize-create-theme) t))) |
| 295 | (let ((theme (call-interactively 'custom-theme-merge-theme))) | 295 | (let ((theme (call-interactively 'custom-theme-merge-theme))) |
| 296 | (unless (eq theme 'user) | 296 | (unless (eq theme 'user) |
diff --git a/lisp/filesets.el b/lisp/filesets.el index 4ca5a9d1420..eb8cdb02617 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el | |||
| @@ -1798,7 +1798,7 @@ User will be queried, if no fileset name is provided." | |||
| 1798 | filesets-data nil))) | 1798 | filesets-data nil))) |
| 1799 | (entry (or (assoc name filesets-data) | 1799 | (entry (or (assoc name filesets-data) |
| 1800 | (when (y-or-n-p | 1800 | (when (y-or-n-p |
| 1801 | (format "Fileset %s does not exist. Create it?" | 1801 | (format "Fileset %s does not exist. Create it? " |
| 1802 | name)) | 1802 | name)) |
| 1803 | (progn | 1803 | (progn |
| 1804 | (add-to-list 'filesets-data (list name '(:files))) | 1804 | (add-to-list 'filesets-data (list name '(:files))) |
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 89aeef53b80..a9105227bfd 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el | |||
| @@ -2287,7 +2287,7 @@ this file, or a list of arguments to send to the program." | |||
| 2287 | (interactive "DNew repository: ") | 2287 | (interactive "DNew repository: ") |
| 2288 | (if (or (file-directory-p (expand-file-name "CVSROOT" newroot)) | 2288 | (if (or (file-directory-p (expand-file-name "CVSROOT" newroot)) |
| 2289 | (y-or-n-p (concat "Warning: no CVSROOT found inside repository." | 2289 | (y-or-n-p (concat "Warning: no CVSROOT found inside repository." |
| 2290 | " Change cvs-cvsroot anyhow?"))) | 2290 | " Change cvs-cvsroot anyhow? "))) |
| 2291 | (setq cvs-cvsroot newroot))) | 2291 | (setq cvs-cvsroot newroot))) |
| 2292 | 2292 | ||
| 2293 | ;;;; | 2293 | ;;;; |