From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ian Eure Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#5112: 23.1.50; [PATCH] Merge conflict committed to CVS Date: Fri, 27 Nov 2009 11:24:26 -0800 Message-ID: Reply-To: Ian Eure , 5112@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259827671 18397 80.91.229.12 (3 Dec 2009 08:07:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2009 08:07:51 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 03 09:07:44 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 1NG6ix-0007JH-HH for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 Dec 2009 09:07:40 +0100 Original-Received: from localhost ([127.0.0.1]:35568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NG6ix-0003Fd-23 for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 Dec 2009 03:07:39 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NG6ir-0003DZ-1X for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 03:07:33 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NG6il-00039n-RV for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 03:07:32 -0500 Original-Received: from [199.232.76.173] (port=53344 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NG6il-00039f-Np for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 03:07:27 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:39692) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NG6il-0001F8-1J for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 03:07:27 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NG6ij-0002Il-VU for bug-gnu-emacs@gnu.org; Thu, 03 Dec 2009 03:07:26 -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 nB387O0q013273; Thu, 3 Dec 2009 00:07:24 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id nB3856pi012498; Thu, 3 Dec 2009 00:05:06 -0800 Resent-Date: Thu, 3 Dec 2009 00:05:06 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Ian Eure Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 03 Dec 2009 08:05:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 5112 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.125982721111945 (code B ref -1); Thu, 03 Dec 2009 08:05:05 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 3 Dec 2009 08:00:11 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-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 Original-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 Original-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 Original-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 Original-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 Original-Received: by proton.local (Postfix, from userid 502) id 1BB3D356328; Fri, 27 Nov 2009 11:24:26 -0800 (PST) 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) X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Resent-Date: Thu, 03 Dec 2009 03:07:32 -0500 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:33171 gmane.emacs.pretest.bugs:25271 Archived-At: 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)