From monnier@iro.umontreal.ca Thu May 8 14:17:01 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=0.3 required=4.0 tests=AWL,MURPHY_DRUGS_REL8 autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at submit) by emacsbugs.donarmstrong.com; 8 May 2008 21:17:02 +0000 Received: from mercure.iro.umontreal.ca (mercure.iro.umontreal.ca [132.204.24.67]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m48LGrqq028622 for ; Thu, 8 May 2008 14:16:55 -0700 Received: by mercure.iro.umontreal.ca (Postfix, from userid 20848) id 1BEEF2CFD06; Thu, 8 May 2008 17:16:53 -0400 (EDT) X-Original-To: monnier@iro.umontreal.ca Received: from pinpin.iro.umontreal.ca (pinpin.iro.umontreal.ca [132.204.24.52]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id D5D992CFCE9 for ; Thu, 8 May 2008 17:16:52 -0400 (EDT) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by pinpin.iro.umontreal.ca (Postfix) with ESMTP id BE6A03B8AA7 for ; Thu, 8 May 2008 17:16:42 -0400 (EDT) Received: from localhost ([127.0.0.1]:50291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JuDTm-0008R0-CC for monnier@iro.umontreal.ca; Thu, 08 May 2008 17:16:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JuDT1-0008Fc-02 for emacs-devel@gnu.org; Thu, 08 May 2008 17:15:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JuDSz-0008Ev-9B for emacs-devel@gnu.org; Thu, 08 May 2008 17:15:54 -0400 Received: from [199.232.76.173] (port=38388 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JuDSz-0008Ep-5w for emacs-devel@gnu.org; Thu, 08 May 2008 17:15:53 -0400 Received: from fencepost.gnu.org ([140.186.70.10]:59992) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JuDSy-0008PD-Lf for emacs-devel@gnu.org; Thu, 08 May 2008 17:15:52 -0400 Received: from mx10.gnu.org ([199.232.76.166]:37301) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1JuDSG-0004xx-OM for emacs-pretest-bug@gnu.org; Thu, 08 May 2008 17:15:08 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1JuDSr-0008NS-E3 for emacs-pretest-bug@gnu.org; Thu, 08 May 2008 17:15:51 -0400 Received: from mail.uni-ulm.de ([134.60.1.11]:61606) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JuDSr-0008Mi-01 for emacs-pretest-bug@gnu.org; Thu, 08 May 2008 17:15:45 -0400 Received: from bridgekeeper.physik.uni-ulm.de (bridgekeeper.physik.uni-ulm.de [134.60.41.37]) by mail.uni-ulm.de (8.14.2/8.14.2) with ESMTP id m48LFeAo001575 for ; Thu, 8 May 2008 23:15:41 +0200 (MEST) Received: from localhost (bridgekeeper.physik.uni-ulm.de [134.60.41.37]) by bridgekeeper.physik.uni-ulm.de (Postfix) with ESMTP id D312E130A8 for ; Thu, 8 May 2008 23:15:39 +0200 (CEST) From: Reiner Steib To: emacs-pretest-bug@gnu.org X-Face: /U7=m^"/-Dn61mAl{g9e3>\G5Tp,oEX|V)g2I1hBk\ML; )7A?6cmB-y7y?'NA^J<=oz7syB =(McAwIHgLX!.B?R3X}98d@?>CrT094KLWh]WU4gDpnL/")MS(XoQTv`Oq225uL>+; CpPXo$N5e>N> $tPd-gbB^F{gQS#1ase]XO~D4p4M"3+F-7~u]dy3I?Pb8RO*H-EFeWDUf?Rf, d]pv\Jvh2Cht!A=im yKAS2Z%Ao^;}W/qzMvMm Mail-Followup-To: emacs-pretest-bug@gnu.org Date: Thu, 08 May 2008 23:14:08 +0200 Message-ID: User-Agent: Gnus/5.110009 (No Gnus v0.9) Emacs/22.2.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-DCC-PacNet-SG-Metrics: poseidon 1358; Body=1 Fuz1=1 Fuz2=1 X-Virus-Scanned: by amavisd-new X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) Cc: Subject: 23.0.60; smerge-command-prefix custom type X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Reiner Steib List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-devel-bounces+monnier=iro.umontreal.ca@gnu.org Errors-To: emacs-devel-bounces+monnier=iro.umontreal.ca@gnu.org X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.6, requis 5, autolearn=not spam, BAYES_00 -2.60, SPF_HELO_PASS -0.00) X-DIRO-MailScanner-From: emacs-devel-bounces+monnier=iro.umontreal.ca@gnu.org Hi, customizing `smerge-command-prefix' ends up like this: ,----[ M-x customize-variable RET smerge-command-prefix RET ] | Smerge Command Prefix: [Hide Value] [Value Menu] String: ^C^ | [State]: STANDARD. | Prefix for `smerge-mode' commands. | -UUU:**--F1 *Customize Option: Smerge Command Prefix* (Custom)---- | Available choices: | | 0 = String | 1 = String | 2 = String | 3 = String `---- All choices look the same. I'd suggest to install this patch... --8<---------------cut here---------------start------------->8--- --- smerge-mode.el 12 Apr 2008 11:36:45 +0200 1.66 +++ smerge-mode.el 08 May 2008 23:05:59 +0200 @@ -160,7 +160,10 @@ (defcustom smerge-command-prefix "\C-c^" "Prefix for `smerge-mode' commands." :group 'smerge - :type '(choice (string "\e") (string "\C-c^") (string "") string)) + :type '(choice (const :tag "ESC" "\e") + (const :tag "C-c ^" "\C-c^" ) + (const :tag "none" "") + string)) (easy-mmode-defmap smerge-mode-map `((,smerge-command-prefix . ,smerge-basic-map)) --8<---------------cut here---------------end--------------->8--- ... so that we get: ,----[ M-x customize-variable RET smerge-command-prefix RET ] | Smerge Command Prefix: [Hide Value] [Value Menu] C-c ^ | [State]: STANDARD. | Prefix for `smerge-mode' commands. | -UUU:**--F1 *Customize Option: Smerge Command Prefix* (Custom)---- | Available choices: | | 0 = ESC | 1 = C-c ^ | 2 = none | 3 = String `---- Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ From rgm@gnu.org Thu May 29 16:13:59 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-8.7 required=4.0 tests=AWL,BAYES_00, MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 205-done) by emacsbugs.donarmstrong.com; 29 May 2008 23:14:00 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m4TNDuu0012971 for <205-done@emacsbugs.donarmstrong.com>; Thu, 29 May 2008 16:13:58 -0700 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1K1rI2-0001SY-Gi; Thu, 29 May 2008 19:12:10 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <18495.14410.449247.831875@fencepost.gnu.org> Date: Thu, 29 May 2008 19:12:10 -0400 From: Glenn Morris To: 205-done@debbugs.gnu.org Subject: Re: 23.0.60; smerge-command-prefix custom type X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: white X-Ran: lEQeL~o;B~:ZGRe)iv,HycC#K@u,pY/+06_r'EV0IfK^QrxY~EN:o~'H^p#Ff47i^vHao_ patch was applied. From unknown Sat Jun 21 10:38:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: $requester Subject: Internal Control Message-Id: bug archived. Date: Fri, 27 Jun 2008 14:24:03 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A log time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator