Re: [Urgent, 21.0] Correct big screwup in package-ui
>>>> "Jan" == Jan Vroonhof
<vroonhof(a)math.ethz.ch> writes:
Hello Jan,
I've tried to apply your patch and it fails:
cd c:\Program Files\XEmacs\XEmacs-21.0\lisp\
\cvs\patch package-ui.el package-ui.patch
Compilation started at Wed Oct 14 23:34:28 1998
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From: Jan Vroonhof <vroonhof(a)math.ethz.ch>
|Subject: [Urgent, 21.0] Correct big screwup in package-ui
|To: xemacs-patches(a)xemacs.org
|Date: Wed, 14 Oct 1998 19:58:12 +0100
|Message-ID: <78F4AE107130C65D8525669D00686A5D.006834F08025669D(a)notes.teradyne.com>
|Xref: TWILIGHT xemacs-patches:20
|X-From-Line: vroonhof(a)math.ethz.ch Wed Oct 14 19:58:12 1998
|MIME-Version: 1.0
|Content-Type: text/plain; charset="us-ascii"
|Content-Transfer-Encoding: 7bit
|Lines: 38
|X-Gnus-Article-Number: 20 Wed Oct 14 23:08:29 1998
|
|
|
|<Blush>
|
|1998-10-14 Jan Vroonhof <vroonhof(a)math.ethz.ch>
|
| * package-ui.el: Correct obvious thinko in choosing extent face.
|
|
|Index: lisp/package-ui.el
|===================================================================
|RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/package-ui.el,v
|retrieving revision 1.5
|diff -u -u -r1.5 package-ui.el
|--- package-ui.el 1998/10/13 07:36:46 1.5
|+++ package-ui.el 1998/10/14 22:29:18
--------------------------
Patching file package-ui.el using Plan A...
Hunk #1 failed at 240.
Hunk #2 failed at 536.
2 out of 2 hunks failed--saving rejects to package-ui.el.rej
done
Compilation exited abnormally with code 2 at Wed Oct 14 23:34:29
And here is package-ui.el.rej:
***************
*** 240,246 ****
(progn
(setq disp (pui-package-symbol-char pkg-sym version))
(setq sym-char (car disp))
- (if (cdr disp)
(set-extent-face extent (get-face (car (cdr disp))))
(set-extent-face extent (get-face 'default)))
))
--- 240,246 ----
(progn
(setq disp (pui-package-symbol-char pkg-sym version))
(setq sym-char (car disp))
+ (if (car (cdr disp))
(set-extent-face extent (get-face (car (cdr disp))))
(set-extent-face extent (get-face 'default)))
))
***************
*** 536,542 ****
(point)))
)
(setq extent (make-extent b e))
- (if (cdr disp)
(set-extent-face extent (get-face (car (cdr disp))))
(set-extent-face extent (get-face 'default)))
(set-extent-property extent 'highlight t)
--- 536,542 ----
(point)))
)
(setq extent (make-extent b e))
+ (if (car (cdr disp))
(set-extent-face extent (get-face (car (cdr disp))))
(set-extent-face extent (get-face 'default)))
(set-extent-property extent 'highlight t)
Jan> <Blush>
Jan> 1998-10-14 Jan Vroonhof <vroonhof(a)math.ethz.ch>
Jan> * package-ui.el: Correct obvious thinko in choosing
Jan> extent face.
Jan> Index: lisp/package-ui.el
Jan> ===================================================================
Jan> RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/package-ui.el,v
Jan> retrieving revision 1.5 diff -u -u -r1.5 package-ui.el ---
Jan> package-ui.el 1998/10/13 07:36:46 1.5 +++ package-ui.el
Jan> 1998/10/14 22:29:18 ＠＠ -240,7 +240,7 ＠＠ (progn (setq disp
Jan> (pui-package-symbol-char pkg-sym version)) (setq sym-char
Jan> (car disp)) - (if (cdr disp) + (if (car (cdr disp))
Jan> (set-extent-face extent (get-face (car (cdr disp))))
Jan> (set-extent-face extent (get-face 'default))) )) ＠＠ -536,7
Jan> +536,7 ＠＠ (point))) ) (setq extent (make-extent b e)) - (if
Jan> (cdr disp) + (if (car (cdr disp)) (set-extent-face extent
Jan> (get-face (car (cdr disp)))) (set-extent-face extent
Jan> (get-face 'default))) (set-extent-property extent 'highlight
Jan> t)
--
Adrian Aichner
Applications Engineer
Teradyne GmbH
Semiconductor Test Group Telephone +49/89/41861(0)-208
Dingolfinger Strasse 2 Fax +49/89/41861-217
D-81673 MUENCHEN E-mail adrian.aichner(a)teradyne.com