From: Douglas Lewan <d_lewan2000@yahoo.com>
To: "help-gnu-emacs@gnu.org" <help-gnu-emacs@gnu.org>
Subject: Re: syncing ediff
Date: Thu, 8 Mar 2012 05:52:08 -0800 (PST) [thread overview]
Message-ID: <1331214728.14106.YahooMailNeo@web161505.mail.bf1.yahoo.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]
Well, I couldn't find what I want, so here is a little hack that is adequate. It's definitely geared toward C code.
If anyone would like to make it good, I'd be very happy.
;;; Commentary:
;; Sometimes ediff gets confused about which regions should correspond.
;; (This seems most common around blank or effectively blank lines.)
;; The problem really only arises from diffing long things (usually files).
;; This file contains code to help diff two things (usually files)
;; just one function at a time.
;;; Documentation:
;; To use this:
;; (1) Load this code.
;; (2) Open the two files to be diffed in exactly 2 windows.
;; (3) Put the point in the function of interest in one of those windows.
;; (4) M-x ediff-defun-at-point
;;; Code:
;;
;; Dependencies
;;
(require 'which-func)
;;
;; Vars
;;
(defvar *ca-symbol-re* "\\sw\\(?:\\sw\\|\\s_\\)*"
"RE to match a symbol in C.")
(defvar *ca-type-re*
(concat
"\\(?:static\\|extern\\s-+\\)?" ;Maybe it's qualified
*ca-symbol-re* "\\s-*" ;A type
"\\**" ;Maybe it's a pointer
)
"RE to match a type in a C declaration.")
;;
;; Commands
;;
(defun narrow-to-this-defun-in-both-windows ()
"Do that.
CAVEAT: Different packages have different ideas
about what function they're in at the beginning of a function declaration."
(interactive)
(let ((function-name (which-function)))
(widen)
(narrow-to-defun)
(other-window 1)
(widen)
(goto-char (point-min))
(if (re-search-forward (format (concat "^" *ca-type-re* "\\s-+" "%s" "\\s-*(") function-name (point-max) t))
(narrow-to-defun)
(error "That function doesn't exist in the other window."))
(previous-window)))
(defun ediff-defun-at-point ()
(interactive)
(narrow-to-this-defun-in-both-windows)
(ediff-buffers (window-buffer)
(window-buffer (next-window))))
,Doug
Douglas Lewan
(908) 720-7908
d_lewan2000@yahoo.com
[-- Attachment #2: Type: text/html, Size: 2749 bytes --]
reply other threads:[~2012-03-08 13:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331214728.14106.YahooMailNeo@web161505.mail.bf1.yahoo.com \
--to=d_lewan2000@yahoo.com \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).