From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.bugs Subject: bug#12507: Option `(bookmark-)version-control': Use :tag so doc string matches menu Date: Sun, 30 Sep 2012 22:38:12 -0500 Message-ID: <87y5jqhnff.fsf@floss.red-bean.com> References: Reply-To: Karl Fogel NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1349062725 7532 80.91.229.3 (1 Oct 2012 03:38:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Oct 2012 03:38:45 +0000 (UTC) To: 12507-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 01 05:38:50 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TIWqF-0002Zg-Or for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Oct 2012 05:38:47 +0200 Original-Received: from localhost ([::1]:34550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIWqA-0006eQ-8e for geb-bug-gnu-emacs@m.gmane.org; Sun, 30 Sep 2012 23:38:42 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIWq7-0006eG-Qv for bug-gnu-emacs@gnu.org; Sun, 30 Sep 2012 23:38:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIWq6-00083B-Mi for bug-gnu-emacs@gnu.org; Sun, 30 Sep 2012 23:38:39 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIWq6-000837-I1 for bug-gnu-emacs@gnu.org; Sun, 30 Sep 2012 23:38:38 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TIWqU-0000l1-E2 for bug-gnu-emacs@gnu.org; Sun, 30 Sep 2012 23:39:02 -0400 In-Reply-To: Resent-From: Karl Fogel Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Oct 2012 03:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 12507 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 12507@debbugs.gnu.org, kfogel@red-bean.com Original-Received: via spool by 12507-done@debbugs.gnu.org id=D12507.13490627242881 (code D ref 12507); Mon, 01 Oct 2012 03:39:02 +0000 Original-Received: (at 12507-done) by debbugs.gnu.org; 1 Oct 2012 03:38:44 +0000 Original-Received: from localhost ([127.0.0.1]:35312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIWqC-0000kQ-4E for submit@debbugs.gnu.org; Sun, 30 Sep 2012 23:38:44 -0400 Original-Received: from mail-ie0-f172.google.com ([209.85.223.172]:47871) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIWq9-0000kJ-Ps for 12507-done@debbugs.gnu.org; Sun, 30 Sep 2012 23:38:42 -0400 Original-Received: by iec9 with SMTP id 9so11827336iec.3 for <12507-done@debbugs.gnu.org>; Sun, 30 Sep 2012 20:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:reply-to:date:message-id:mime-version :content-type; bh=w9ifs203Chh6byZ85IJHs/mSV2+d+UkBBh4jMaALzRM=; b=DMRPf4LoiCJFejM81zu0YYHaaxy2XExVqZ3R0tOB0gOyC0qD/rnxZN6W1qlUp82nHC Fj3xqatXawu1BAoVhhPARFG+901jXJj9/VXruEYb5zDJbZzwf9fbwnAOJY7HMpx7QY9d rsj9Z+tSkKZbHaoYEIBj8utIng1Nppz8UReG94DeQpUbsDJVvzCK/2C6la74l8FZmzi3 qCaL2BBv0EPYU2KcNkhnjTYs6IvPcfILyGykmJm4EndoW+D6JpWZS0zTJWUhvbJptoaw HNe8vSpt4NqqeemIm1t2Q134anlxJOhLfzj4Zt10RQLwAIG0zONVBgtybkq3JpXsD7vK STKQ== Original-Received: by 10.50.220.129 with SMTP id pw1mr4522708igc.47.1349062696822; Sun, 30 Sep 2012 20:38:16 -0700 (PDT) Original-Received: from floss.red-bean.com (173-109-178-220.pools.spcsdns.net. [173.109.178.220]) by mx.google.com with ESMTPS id ce10sm7453692igb.1.2012.09.30.20.38.14 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 30 Sep 2012 20:38:15 -0700 (PDT) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:65043 Archived-At: Fixed (see below), but please review. I don't fully understand the whole customization system because I never use it myself (I just read doc strings and set variables directly in Elisp), so I don't quite get what `other' mean if used instead of `const', and I didn't fully understand the last paragraph of the original bug report. I looked in the Info pages, but they didn't clarify much about this. -Karl Revision info: revno: 110305 revision-id: kfogel@red-bean.com-20121001033206-5eja4ztyhs1sjm7q parent: cyd@gnu.org-20121001031702-2mei04wuzv2pk1e7 committer: Karl Fogel branch nick: trunk timestamp: Sun 2012-09-30 22:32:06 -0500 message: * lisp/bookmark.el (bookmark-version-control): Give tags in the :type choices (Bug#12309), and improve doc string. Diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-01 02:07:14 +0000 +++ lisp/ChangeLog 2012-10-01 03:31:41 +0000 @@ -1,3 +1,8 @@ +2012-10-01 Karl Fogel + + * bookmark.el (bookmark-version-control): Give tags in the + :type choices (Bug#12309), and improve doc string. + 2012-10-01 Paul Eggert Revert the FOLLOW-SYMLINKS change for file-attributes. === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2012-09-25 04:13:02 +0000 +++ lisp/bookmark.el 2012-10-01 03:32:18 +0000 @@ -99,12 +99,14 @@ (defcustom bookmark-version-control 'nospecial "Whether or not to make numbered backups of the bookmark file. -It can have four values: t, nil, `never', and `nospecial'. +It can have four values: t, nil, `never', or `nospecial'. The first three have the same meaning that they do for the -variable `version-control', and the final value `nospecial' means just -use the value of `version-control'." - :type '(choice (const nil) (const never) (const nospecial) - (other t)) +variable `version-control'; the value `nospecial' (the default) means +just use the value of `version-control'." + :type '(choice (const :tag "If existing" nil) + (const :tag "Never" never) + (const :tag "Use the value of `version-control'" nospecial) + (const :tag "Always" t)) :group 'bookmark)