[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108082: * lisp/cus-edit.el (custom-v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108082: * lisp/cus-edit.el (custom-variable-documentation): Simplify with format. |
Date: |
Tue, 01 May 2012 14:47:23 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108082
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-01 14:47:23 -0400
message:
* lisp/cus-edit.el (custom-variable-documentation): Simplify with format.
modified:
lisp/ChangeLog
lisp/cus-edit.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-05-01 16:10:02 +0000
+++ b/lisp/ChangeLog 2012-05-01 18:47:23 +0000
@@ -1,3 +1,7 @@
+2012-05-01 Glenn Morris <address@hidden>
+
+ * cus-edit.el (custom-variable-documentation): Simplify with format.
+
2012-05-01 Aaron S. Hawley <address@hidden>
Stefan Monnier <address@hidden>
=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el 2012-04-25 08:38:11 +0000
+++ b/lisp/cus-edit.el 2012-05-01 18:47:23 +0000
@@ -1,6 +1,6 @@
;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
;;
-;; Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <address@hidden>
;; Maintainer: FSF
@@ -2460,15 +2460,15 @@
"Return documentation of VARIABLE for use in Custom buffer.
Normally just return the docstring. But if VARIABLE automatically
becomes buffer local when set, append a message to that effect."
- (if (and (local-variable-if-set-p variable)
- (or (not (local-variable-p variable))
- (with-temp-buffer
- (local-variable-if-set-p variable))))
- (concat (documentation-property variable 'variable-documentation)
+ (format "%s%s" (documentation-property variable 'variable-documentation)
+ (if (and (local-variable-if-set-p variable)
+ (or (not (local-variable-p variable))
+ (with-temp-buffer
+ (local-variable-if-set-p variable))))
"\n
This variable automatically becomes buffer-local when set outside Custom.
-However, setting it through Custom sets the default value.")
- (documentation-property variable 'variable-documentation)))
+However, setting it through Custom sets the default value."
+ "")))
(define-widget 'custom-variable 'custom
"A widget for displaying a Custom variable.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108082: * lisp/cus-edit.el (custom-variable-documentation): Simplify with format.,
Glenn Morris <=