Just merged from Matthieu upto
[EMAIL PROTECTED]
Then I get only one missing patch:
Missing patches from partner xtla-0.1-Stefan-REICHÖR:
[EMAIL PROTECTED] [NOT MERGED]
Merged from Matthieu (patch447-460), Masatake (patch203-207)
Stefan Reichoer <[EMAIL PROTECTED]>
2004-09-20 18:59:29 GMT
But merging this one creates a conflict. IMHO this should
not happen, as it is just a merge of patches I have merged
already. Steve, did you have any conflicts fixed in that
merge which may cause my conflicts?
It also duplicates code ;c/, see the diff below ...
Did I get something wrong?
Regards,
Robert
* looking for [EMAIL PROTECTED] to compare with
* comparing to [EMAIL PROTECTED]
A {arch}/xtla/xtla--main/xtla--main--0.1/[EMAIL PROTECTED]/patch-112
M lisp/xtla.el
M lisp/xtla-defs.el
* modified files
--- orig/lisp/xtla-defs.el
+++ mod/lisp/xtla-defs.el
@@ -276,6 +276,24 @@
(defvar xtla--name-read-bookmark-menu (cons "Insert Version in Bookmarks" nil))
(fset 'xtla--name-read-bookmark-menu (cons 'keymap
xtla--name-read-bookmark-menu))
+(defvar tla--name-read-extension-keydefs
+ '(([(control r)] . tla-name-read-refresh-cache)
+ ([(meta *)] . tla-name-read-insert-default-archive)
+ ([(meta \.)] . tla-name-read-insert-info-at-point)
+ ([(meta \;)] .
tla-name-read-insert-version-associated-with-default-directory)
+ ([(control n)] . tla-name-read-insert-partner-next)
+ ([(control p)] . tla-name-read-insert-partner-previous)
+ ([(control v)] . tla-name-read-insert-bookmark-next)
+ ([(meta v)] . tla-name-read-insert-bookmark-previous)
+ ([(meta ^)] . tla-name-read-insert-ancestor)
+ ([(control h)] . tla-name-read-help)
+ ([(meta \?)] . tla-name-read-inline-help))
+ "Key definitions table for `tla--name-read-minibuf-map'.
+The reason these definitions are defined separately from
+`tla--name-read-minibuf-map' is that to reuse these definitions
+in `tla-name-read-help'. Don't forget to evalute `tla--name-read-minibuf-map'
again
+after updating this value.")
+
;;;###autoload
(defvar tla--name-read-extension-keydefs
'(([(control r)] . tla-name-read-refresh-cache)
--- orig/lisp/xtla.el
+++ mod/lisp/xtla.el
@@ -172,6 +172,15 @@
(interactive)
(let* ((name "*xtla-welcome*")
(buffer (get-buffer name)))
+ (tla--message-with-bouncing
+ (concat "Author: Stefan Reichoer <[EMAIL PROTECTED]>, "
+ "Contributions from: "
+ "Matthieu Moy <[EMAIL PROTECTED]>, "
+ "Masatake YAMATO <[EMAIL PROTECTED]>, "
+ "Milan Zamazal <[EMAIL PROTECTED]>, "
+ "Martin Pool <[EMAIL PROTECTED]>, "
+ "Robert Widhopf-Fenk <[EMAIL PROTECTED]>, "
+ "Mark Triggs <[EMAIL PROTECTED]>"))
(if buffer (tla-switch-to-buffer buffer)
(tla-switch-to-buffer
(setq buffer (get-buffer-create name)))
@@ -398,6 +407,7 @@
prefix))
(error "No context-menu under the point")))
+<<<<<<< TREE
;; Test cases
;; (tla--message-with-bouncing
@@ -481,6 +491,91 @@
(return-from tla--message-with-rolling)))
(garbage-collect)))))
+=======
+
+;; Test cases
+;; (tla--message-with-bouncing
+;; (concat "Author: Stefan Reichoer <[EMAIL PROTECTED]>, "
+;; "Contributions from: "
+;; "Matthieu Moy <[EMAIL PROTECTED]>, "
+;; "Masatake YAMATO <[EMAIL PROTECTED]>, "
+;; "Milan Zamazal <[EMAIL PROTECTED]>, "
+;; "Martin Pool <[EMAIL PROTECTED]>, "
+;; "Robert Widhopf-Fenk <[EMAIL PROTECTED]>, "
+;; "Mark Triggs <[EMAIL PROTECTED]>"))
+;; (tla--message-with-rolling
+;; (concat "Author: Stefan Reichoer <[EMAIL PROTECTED]>, "
+;; "Contributions from: "
+;; "Matthieu Moy <[EMAIL PROTECTED]>, "
+;; "Masatake YAMATO <[EMAIL PROTECTED]>, "
+;; "Milan Zamazal <[EMAIL PROTECTED]>, "
+;; "Martin Pool <[EMAIL PROTECTED]>, "
+;; "Robert Widhopf-Fenk <[EMAIL PROTECTED]>, "
+;; "Mark Triggs <[EMAIL PROTECTED]>"))
+(defvar tla--message-long-default-interval 0.2
+ "Default animation step interval used in `tla--message-with-bouncing' and
+`tla--message-with-rolling'")
+(defvar tla--message-long-border-interval 1.0
+ "Animation step interval when bouncing in `tla--message-with-bouncing'.")
+(defun* tla--message-with-bouncing (&rest msg)
+ "Similar to `message' but display the message in bouncing animation to show
long line."
+ (setq msg (apply 'format msg))
+ (let* ((width (- (window-width (minibuffer-window))
+ (+ 1 (length "[<] ") (length " [>]"))))
+ (msglen (length msg))
+ submsg
+ (steps (- msglen width))
+ j)
+ (if (< msglen width)
+ (message "%s" msg)
+ (while t
+ ;; Go fowrad
+ (dotimes (i steps)
+ (setq submsg (substring msg i (+ i width)))
+ (message "[<] %s [ ]" submsg)
+ (unless (sit-for (cond
+ ((eq i 0) tla--message-long-border-interval)
+ (t tla--message-long-default-interval)))
+ (return-from tla--message-with-bouncing)))
+ ;; Go back
+ (dotimes (i steps)
+ (setq j (- steps i))
+ (setq submsg (substring msg j (+ j width)))
+ (message "[ ] %s [>]" submsg)
+ (unless (sit-for (cond
+ ((eq i 0) tla--message-long-border-interval)
+ (t tla--message-long-default-interval)))
+ (return-from tla--message-with-bouncing)))
+ (garbage-collect)))))
+
+(defun* tla--message-with-rolling (&rest msg)
+ "Similar to `message' but display the message in rolling animation to show
long line."
+ (setq msg (concat " <MESSAGE>: "
+ (apply 'format msg)
+ " "))
+ (let* ((width (- (window-width (minibuffer-window))
+ (+ 1 (length "[<] "))))
+ (msglen (length msg))
+ submsg
+ (normal-range (- msglen width))
+ j)
+ (if (< msglen width)
+ (message "%s" msg)
+ (while t
+ (dotimes (i msglen)
+ (setq submsg (if (< i normal-range)
+ (substring msg i (+ i width))
+ ;; Rolling is needed.
+ (concat (substring msg i)
+ (substring msg 0 (- (+ i width) msglen)))))
+ (message "[<] %s" submsg)
+ (unless (sit-for (cond
+ ((eq i 0) tla--message-long-border-interval)
+ (t tla--message-long-default-interval)))
+ (return-from tla--message-with-rolling)))
+ (garbage-collect)))))
+
+>>>>>>> MERGE-SOURCE
;; ----------------------------------------------------------------------------
;; Name read engine helpers
;; ----------------------------------------------------------------------------
* added files
