Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Multiple Small Changes

There are multiple small changes here to correct compatability problems.

Conflicts:
	ecb-mode-line.el
	ecb-multiframe.el
	ecb-semantic-wrapper.el
	ecb.el
  • Loading branch information...
commit 69a25b3cc67b37fd6154d95d93e036e19470525d 1 parent 66a3b85
Ryan Ware authored pwojnowski committed
View
6 ecb-mode-line.el
@@ -44,7 +44,7 @@
(require 'ecb-face)
;; XEmacs
-(silentcomp-defun redraw-modeline)
+(silentcomp-defun ecb-redraw-modeline)
(silentcomp-defun make-extent)
(silentcomp-defun set-extent-face)
(silentcomp-defun set-extent-property)
@@ -328,7 +328,9 @@ as \"W-<number>\"."
(if (ecb-buffer-obj buffer-name)
(with-current-buffer buffer-name
(setq mode-line-format new-mode-line-format)
- (force-mode-line-update))
+ (if ecb-running-xemacs
+ (ecb-redraw-modeline)
+ (force-mode-line-update)))
(message "This buffer isn't available: %s" buffer-name)))
(silentcomp-provide 'ecb-mode-line)
View
31 ecb-multiframe.el
@@ -94,6 +94,7 @@
;;reset everything to the default value?
(dolist(variable ecb-multiframe-variables)
+ (set-frame-parameter nil frame (list (cons variable nil)))
(modify-frame-parameters frame (list (cons variable nil))))
;;ecb-eshell-buffer-name ?
@@ -121,8 +122,9 @@
(mapc (lambda(sframe)
(when (boundp sframe)
- (modify-frame-parameters frame (list (cons sframe frame)))))
- '(speedbar-frame speedbar-attached-frame dframe-attached-frame))
+ (set-frame-parameter nil frame (list (cons sframe frame))))
+ (modify-frame-parameters frame (list (cons sframe frame))))
+ '(speedbar-frame speedbar-attached-frame dframe-attached-frame))
;;setup speedbar with a new buffer
@@ -130,6 +132,8 @@
(setq new-ecb-speedbar-buffer-name (ecb-multiframe-setup-buffer-name 'ecb-speedbar-buffer-name " SPEEDBAR <%s>"))
+ (set-frame-parameter nil frame (list (cons 'speedbar-buffer
+ (get-buffer-create new-ecb-speedbar-buffer-name))))
(modify-frame-parameters frame (list (cons 'speedbar-buffer
(get-buffer-create new-ecb-speedbar-buffer-name)))))))
@@ -140,17 +144,22 @@ frame. When complete return the new buffer name."
(let((new-buffer-name (format buffer-format-name
(format-time-string "%s"))))
-
- (modify-frame-parameters nil (list (cons variable new-buffer-name)))
+ (with-no-warnings
+ (set-frame-parameter nil frame (list (cons variable new-buffer-name))))
+
+ (with-no-warnings
+ (modify-frame-parameters frame (list (cons variable new-buffer-name))))
+
new-buffer-name))
-(defun ecb-multiframe-deactivate-internal ()
- "Deactivates the ECB and kills all ECB buffers and windows."
- (unless (not ecb-minor-mode)
-
- (setq ecb-minor-mode nil))
- (message "The ECB is now deactivated.")
- ecb-minor-mode)
+(with-no-warnings
+ (defun ecb-deactivate-internal ()
+ "Deactivates the ECB and kills all ECB buffers and windows."
+ (unless (not ecb-minor-mode)
+
+ (setq ecb-minor-mode nil))
+ (message "The ECB is now deactivated.")
+ ecb-minor-mode))
(defun ecb-multiframe-activate-hook()
"Hook to run to initialize multiframe support"
View
4 ecb-semantic-wrapper.el
@@ -208,11 +208,11 @@ function ECB uses from the semanticdb library.")
(apply 'semantic-tag name class ignore)
(list name class nil nil nil nil)))
-(defsubst ecb--semantic-tag-new-variable (name type default-value &rest attributes)
+(with-no-warnings(defsubst ecb--semantic-tag-new-variable (name type default-value &rest attributes)
"Create a semantic tag of class variable"
(if (fboundp 'semantic-tag-new-variable)
(apply 'semantic-tag-new-variable name type default-value attributes)
- (list name 'variable nil nil nil nil)))
+ (list name 'variable nil nil nil nil))))
(defsubst ecb--semantic--tag-set-overlay (tag overlay)
"Set the overlay part of TAG with OVERLAY. OVERLAY can be an overlay or an
View
8 ecb-util.el
@@ -2357,6 +2357,14 @@ cons-cell \('test-inner-loop . \"test\")"
;; labels is obsolete as of Gnu Emacs 24.3
(unless (fboundp 'cl-labels) (fset 'cl-labels 'labels))
+;; redraw-modeline is an obsolete function as of Gnu Emacs 24.3
+(defmacro ecb-redraw-modeline (&optional kind)
+ (if (or (> emacs-major-version 24)
+ (and (>= emacs-major-version 24)
+ (>= emacs-minor-version 3)))
+ `(force-mode-line-update ,kind)
+ `(redraw-modeline)))
+
;;; ----- Provide ------------------------------------------
(silentcomp-provide 'ecb-util)
View
15 ecb.el
@@ -200,6 +200,9 @@
;; to avoid compiler grips
(require 'cl))
+;; XEmacs
+(silentcomp-defun ecb-redraw-modeline)
+
;;====================================================
;; Variables
;;====================================================
@@ -1145,8 +1148,9 @@ always the ECB-frame if called from another frame."
(let ((ecb-minor-mode t))
(ecb-deactivate-internal t))
(setq ecb-minor-mode nil)
-
- (force-mode-line-update t)
+ (if ecb-running-xemacs
+ (ecb-redraw-modeline t)
+ (force-mode-line-update t))
(error "ECB %s: %s (error-type: %S, error-data: %S)" ecb-version msg
(car err) (cdr err)))
@@ -1650,8 +1654,11 @@ if the minor mode is enabled.
(if new-state
(ecb-activate-internal)
(ecb-deactivate-internal)))
-
- (force-mode-line-update t)
+
+ (if ecb-running-xemacs
+ (ecb-redraw-modeline t)
+ (force-mode-line-update t))
+
ecb-minor-mode)
Please sign in to comment.
Something went wrong with that request. Please try again.