From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#1154: C-x 4 a in struct [] diff does not work anymore Date: Sun, 12 Oct 2008 19:38:56 -0700 (PDT) Message-ID: <200810130238.m9D2cut9000668@mothra.ics.uci.edu> Reply-To: Dan Nicolaescu , 1154@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 1223866233 11541 80.91.229.12 (13 Oct 2008 02:50:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 13 Oct 2008 02:50:33 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 13 04:51:32 2008 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 1KpDWr-0004XH-SR for geb-bug-gnu-emacs@m.gmane.org; Mon, 13 Oct 2008 04:51:30 +0200 Original-Received: from localhost ([127.0.0.1]:46762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KpDVm-0000Fr-N9 for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Oct 2008 22:50:22 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KpDVX-00006F-H8 for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:50:07 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KpDVV-0008WN-JS for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:50:06 -0400 Original-Received: from [199.232.76.173] (port=40419 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KpDVV-0008W3-Dn for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:50:05 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:51464) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KpDVU-0001sd-VV for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:50:05 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9D2nwmF000871; Sun, 12 Oct 2008 19:49:59 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m9D2j29C032193; Sun, 12 Oct 2008 19:45:02 -0700 X-Loop: don@donarmstrong.com Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Mon, 13 Oct 2008 02:45:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1154 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.122386555630980 (code B ref -1); Mon, 13 Oct 2008 02:45:02 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 13 Oct 2008 02:39:16 +0000 Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9D2dBkH030974 for ; Sun, 12 Oct 2008 19:39:13 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KpDKw-0003wv-Nx for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:39:10 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KpDKu-0003vu-2q for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:39:10 -0400 Original-Received: from [199.232.76.173] (port=36104 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KpDKt-0003vr-St for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:39:07 -0400 Original-Received: from sallyv2.ics.uci.edu ([128.195.1.120]:39372) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1KpDKt-0000fJ-D1 for bug-gnu-emacs@gnu.org; Sun, 12 Oct 2008 22:39:08 -0400 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by sallyv2.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id m9D2cvkU006146 for ; Sun, 12 Oct 2008 19:38:57 -0700 (PDT) Original-Received: (from dann@localhost) by mothra.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id m9D2cut9000668; Sun, 12 Oct 2008 19:38:56 -0700 (PDT) Original-Lines: 36 X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: m9D2cvkU006146 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Sun, 12 Oct 2008 22:50:06 -0400 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:21431 Archived-At: For the patch below, with the point on the first + line, C-x 4 a adds an entry called: * emacsclient.c (]): emacs-22.2 added the correct entry: * emacsclient.c (longopts): Also, for the second hunk C-x 4 a cannot find the function name. Index: emacsclient.c =================================================================== RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v retrieving revision 1.132 diff -u -3 -p -u -p -r1.132 emacsclient.c --- emacsclient.c 19 Sep 2008 16:45:12 -0000 1.132 +++ emacsclient.c 13 Oct 2008 01:34:25 -0000 @@ -156,6 +156,7 @@ struct option longopts[] = { "help", no_argument, NULL, 'H' }, { "version", no_argument, NULL, 'V' }, { "tty", no_argument, NULL, 't' }, + { "nw", no_argument, NULL, 't' }, { "create-frame", no_argument, NULL, 'c' }, { "alternate-editor", required_argument, NULL, 'a' }, #ifndef NO_SOCKETS_IN_FILE_SYSTEM @@ -474,7 +475,7 @@ decode_options (argc, argv) while (1) { - int opt = getopt_long (argc, argv, + int opt = getopt_long_only (argc, argv, #ifndef NO_SOCKETS_IN_FILE_SYSTEM "VHnea:s:f:d:tc", #else