>>>>> "MM" == Matthieu Moy <[EMAIL PROTECTED]> writes:

    MM> Please merge from the mainline, and tell if you have any serious
    MM> problem with it. 

I have.  [EMAIL PROTECTED] has serious
problems with new versions of CVS Emacs
(e.g. [EMAIL PROTECTED]).

For instance, if I start Emacs and run tla-changes, I get an error
(wrong type of argument: keymapp nil).  The same error occurs when most
xtla buffers are created.  The following patch seems to fix it:

diff -cr lisp/xtla-core.el lisp/xtla-core.el
*** lisp/xtla-core.el	Fri Nov  5 14:57:44 2004
--- lisp/xtla-core.el	Fri Nov  5 15:38:47 2004
***************
*** 1480,1490 ****
        ;; See tla-xemacs-buffers-menu in xtla-xemacs.el
        (add-submenu nil '("Tla-Buffers" :filter tla-xemacs-buffers-menu) nil)
      ;; GNU Emacs
-     (define-key-after
-       (or (lookup-key global-map [menu-bar tools XTLA])
-           (lookup-key global-map [menu-bar tools xtla]))
-       [tla-buffers]
-       (cons "Tla-Buffers" (tla--buffers-menu)))
      (let ((map (and
                  (current-local-map)
                  (or (lookup-key (current-local-map) [menu-bar])
--- 1480,1485 ----
diff -cr lisp/xtla-defs.el lisp/xtla-defs.el
*** lisp/xtla-defs.el	Fri Nov  5 14:57:44 2004
--- lisp/xtla-defs.el	Fri Nov  5 15:25:05 2004
***************
*** 1113,1119 ****
  ;;
  ;;;###autoload
  (easy-menu-add-item
!  nil '("tools")
   '("XTLA"
     ["Browse Archives" tla-archives t]
     ["Show Bookmarks" tla-bookmarks t]
--- 1113,1119 ----
  ;;
  ;;;###autoload
  (easy-menu-add-item
!  nil '("Tools")
   '("XTLA"
     ["Browse Archives" tla-archives t]
     ["Show Bookmarks" tla-bookmarks t]
Regards,

Milan Zamazal

-- 
It is the reformer, who is anxious for the reform, and not society, from which
he should expect nothing better than opposition, abhorrence and even mortal
persecution.                                                   -- M. K. Gandhi

Reply via email to