From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: owner@emacsbugs.donarmstrong.com (Emacs bug Tracking System) Newsgroups: gmane.emacs.bugs Subject: bug#5112: marked as done (23.1.50; [PATCH] Merge conflict committed to CVS) Date: Thu, 03 Dec 2009 09:00:04 +0000 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----------=_1259830804-17406-0" X-Trace: ger.gmane.org 1259831309 11972 80.91.229.12 (3 Dec 2009 09:08:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2009 09:08:29 +0000 (UTC) To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 03 10:08:21 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NG7fd-0003Nj-Ua for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 Dec 2009 10:08:18 +0100 Original-Received: from localhost ([127.0.0.1]:52593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NG7fd-0007nJ-JP for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 Dec 2009 04:08:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NG7f2-0007RO-Ec for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 04:07:40 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NG7ex-0007O1-KX for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 04:07:39 -0500 Original-Received: from [199.232.76.173] (port=40911 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NG7ex-0007No-CE for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 04:07:35 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:51597) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NG7eq-0006rd-DO; Thu, 03 Dec 2009 04:07:28 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nB397OQS018799; Thu, 3 Dec 2009 01:07:24 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id nB3904G0017432; Thu, 3 Dec 2009 01:00:04 -0800 X-Mailer: MIME-tools 5.427 (Entity 5.427) X-Loop: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: closed 5112 X-Emacs-PR-Package: emacs X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:33172 Archived-At: This is a multi-part message in MIME format... ------------=_1259830804-17406-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Your message dated Thu, 03 Dec 2009 03:54:56 -0500 with message-id and subject line Re: bug#5112: 23.1.50; [PATCH] Merge conflict committed to= CVS has caused the Emacs bug report #5112, regarding 23.1.50; [PATCH] Merge conflict committed to CVS to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@emacsbugs.donarmstrong.com immediately.) --=20 5112: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3D5112 Emacs Bug Tracking System Contact owner@emacsbugs.donarmstrong.com with problems ------------=_1259830804-17406-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by emacsbugs.donarmstrong.com; 3 Dec 2009 08:00:11 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-0.5 required=4.0 tests=AWL,FOURLA,FVGT_m_MULTI_ODD, IMPRONONCABLE_2,MURPHY_DRUGS_REL8 autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nB3809PY011936 for ; Thu, 3 Dec 2009 00:00:11 -0800 Received: from mail.gnu.org ([199.232.76.166]:34252 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1NG6bg-0005Lj-Sv for emacs-pretest-bug@gnu.org; Thu, 03 Dec 2009 03:00:08 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NG6be-0000pG-7Q for emacs-pretest-bug@gnu.org; Thu, 03 Dec 2009 03:00:08 -0500 Received: from mx20.gnu.org ([199.232.41.8]:39184) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NG6bd-0000p1-Ku for emacs-pretest-bug@gnu.org; Thu, 03 Dec 2009 03:00:05 -0500 Received: from 64-71-7-198.static.wiline.com ([64.71.7.198] helo=proton.local) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NG6bc-0001rG-B3 for emacs-pretest-bug@gnu.org; Thu, 03 Dec 2009 03:00:04 -0500 Received: by proton.local (Postfix, from userid 502) id 1BB3D356328; Fri, 27 Nov 2009 11:24:26 -0800 (PST) From: Ian Eure To: emacs-pretest-bug@gnu.org Subject: 23.1.50; [PATCH] Merge conflict committed to CVS Date: Fri, 27 Nov 2009 11:24:26 -0800 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) The file nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings was committed to CVS HEAD with an unresolved conflict: http://cvs.savannah.gnu.org/viewvc/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings?root=emacs&view=markup Patch: diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index f18751d..2e33a28 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,8 +1,4 @@ - -<<<<<<< InfoPlist.strings -======= CFBundleName = "Emacs"; CFBundleShortVersionString = "Version 23.1.50"; CFBundleGetInfoString = "Emacs version 23.1.50, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc."; ->>>>>>> 1.7 In GNU Emacs 23.1.50.1 (i686-apple-darwin10.0.0, NS apple-appkit-1038.11) of 2009-11-09 on proton.local Windowing system distributor `Apple', version 10.3.1038 configured using `configure '--build' 'i686-apple-darwin10.0.0' '--without-dbus' '--with-ns' 'build_alias=i686-apple-darwin10.0.0' 'CFLAGS=-pipe -march=nocona'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil value of $XMODIFIERS: nil locale-coding-system: nil default enable-multibyte-characters: t Major mode: Shell Minor modes in effect: dirtrack-mode: t which-function-mode: t yas/minor-mode: t ime-bindings: t show-paren-mode: t recentf-mode: t iswitchb-mode: t cua-mode: t auto-insert-mode: t tooltip-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t size-indication-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-x b l s SPC n e C o C-x C-a C-k C-g M-p M-p M-p C-x 1 C-l C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-a C-f C-f C-f C-f C-f C-f C-SPC C-e M-w M-> c a t SPC C-y g i t SPC c o SPC a m s t e r M-p = m a s t e r g i t p SPC g i s t s SPC ! c a t g i t s SPC C-x C-f C-g C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-c C-g C-g C-x b C-p C-e C-c C-x C-f C-3 C-c C-k M-> C-p C-c C-k C-x C-s C-x k RET g i t M-_ M-> g i t s SPC d i g i t d SPC M-p SPC > SPC i n f o p l i s t . s t r i n g s . d i f f M-x r e p o s t r t - r e b M-[ P A T C H C-e SPC C-g C-p C-p C-p C-p C-p C-p C-a C-p C-f C-SPC C-e M-w M-> M-x r g r e p C-y * M-x r e p o r t - e m b Recent messages: Quit Mark set Saving file /Users/ieure/Projects/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings... Wrote /Users/ieure/Projects/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Mark set ~/Projects/emacs [2 times] History item: 1 ~/Projects/emacs Quit Mark set [2 times] Load-path shadows: None found. Features: (shadow mail-extr grep emacsbug vc vc-dispatcher smerge-mode ffap byte-opt bytecomp byte-compile dired-aux dabbrev magit diff-mode log-edit pcvs-util add-log parse-time python-21 python sym-comp multi-isearch w3m-search w3m browse-url doc-view jka-compr image-mode dired timezone w3m-hist w3m-fb w3m-ems w3m-ccl ccl w3m-favicon w3m-image w3m-proc w3m-util vc-git sh-script executable dirtrack ansi-color test-case-mode compile goto-addr light-symbol hi-lock thingatpt hl-line eldoc which-func imenu ime-ns dpkg-dev-el dpkg-dev-el-loaddefs ime-smarty ime-help ime-thrift ime-diff ime-org ime-m4 ime-markdown swank-clojure-autoload ime-clojure slime-autoloads ime-slime w3m-load ime-w3m dropdown-list yasnippet cl cl-19 ime-snippets ime-dired edmacro kmacro ime-ibuffer ime-abbrev ime-inferior ime-erc ime-ssh ime-sql ime-javascript ime-xml ime-html ime-sh ime-tcl ime-elisp ime-python skeleton ime-php ime-vc ime-programming tramp-imap epa derived epg epg-config imap-hash imap message sendmail ecomplete rfc822 mml mml-sec mm-decode mm-bodies mm-encode mailcap mail-parse rfc2231 rfc2047 rfc2045 qp ietf-drums mailabbrev nnheader mm-util mail-prsvr gmm-utils mailheader canlock sha1 hex-util hashcash mail-utils assoc tramp-gw tramp-fish tramp-smb tramp-cache tramp-ftp tramp-cmds tramp regexp-opt auth-source gnus-util netrc time-date shell comint ring password-cache format-spec tramp-compat trampver ime-inserts ime-editing ime-bindings easy-mmode ime-vars ime-fonts ime-autoloads ime-frame ibuf-ext ibuffer uniquify advice help-fns help-mode view advice-preload paren server recentf tree-widget wid-edit iswitchb cua-base autoinsert cus-start cus-load ime-top tooltip ediff-hook vc-hooks lisp-float-type mwheel ns-win easymenu tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button minibuffer faces cus-face text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process ns multi-tty emacs) ------------=_1259830804-17406-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 5112-done) by emacsbugs.donarmstrong.com; 3 Dec 2009 08:54:59 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-7.1 required=4.0 tests=AWL,HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nB38swjr016976 for <5112-done@emacsbugs.donarmstrong.com>; Thu, 3 Dec 2009 00:54:59 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1NG7Si-0001js-EU; Thu, 03 Dec 2009 03:54:56 -0500 From: Glenn Morris To: 5112-done@emacsbugs.donarmstrong.com Subject: Re: bug#5112: 23.1.50; [PATCH] Merge conflict committed to CVS References: X-Spook: NASA SSL fraud eternity server Defcon doctrine AFSPC X-Ran: V{]^XU+=V]L0#eP7~i)i1.{=]??zfa2?-mQuw}MG746wp3S5Zt[onH*GVvjgI_M\w5=)qI X-Hue: cyan X-Debbugs-No-Ack: yes X-Attribution: GM Date: Thu, 03 Dec 2009 03:54:56 -0500 In-Reply-To: (Ian Eure's message of "Fri, 27 Nov 2009 11:24:26 -0800") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Thanks. ------------=_1259830804-17406-0--