Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
6 ecb-mode-line.el
@@ -44,7 +44,7 @@
44 44 (require 'ecb-face)
45 45
46 46 ;; XEmacs
47   -(silentcomp-defun redraw-modeline)
  47 +(silentcomp-defun ecb-redraw-modeline)
48 48 (silentcomp-defun make-extent)
49 49 (silentcomp-defun set-extent-face)
50 50 (silentcomp-defun set-extent-property)
@@ -328,7 +328,9 @@ as \"W-<number>\"."
328 328 (if (ecb-buffer-obj buffer-name)
329 329 (with-current-buffer buffer-name
330 330 (setq mode-line-format new-mode-line-format)
331   - (force-mode-line-update))
  331 + (if ecb-running-xemacs
  332 + (ecb-redraw-modeline)
  333 + (force-mode-line-update)))
332 334 (message "This buffer isn't available: %s" buffer-name)))
333 335
334 336 (silentcomp-provide 'ecb-mode-line)
31 ecb-multiframe.el
@@ -94,6 +94,7 @@
94 94 ;;reset everything to the default value?
95 95
96 96 (dolist(variable ecb-multiframe-variables)
  97 + (set-frame-parameter nil frame (list (cons variable nil)))
97 98 (modify-frame-parameters frame (list (cons variable nil))))
98 99
99 100 ;;ecb-eshell-buffer-name ?
@@ -121,8 +122,9 @@
121 122
122 123 (mapc (lambda(sframe)
123 124 (when (boundp sframe)
124   - (modify-frame-parameters frame (list (cons sframe frame)))))
125   - '(speedbar-frame speedbar-attached-frame dframe-attached-frame))
  125 + (set-frame-parameter nil frame (list (cons sframe frame))))
  126 + (modify-frame-parameters frame (list (cons sframe frame))))
  127 + '(speedbar-frame speedbar-attached-frame dframe-attached-frame))
126 128
127 129 ;;setup speedbar with a new buffer
128 130
@@ -130,6 +132,8 @@
130 132
131 133 (setq new-ecb-speedbar-buffer-name (ecb-multiframe-setup-buffer-name 'ecb-speedbar-buffer-name " SPEEDBAR <%s>"))
132 134
  135 + (set-frame-parameter nil frame (list (cons 'speedbar-buffer
  136 + (get-buffer-create new-ecb-speedbar-buffer-name))))
133 137 (modify-frame-parameters frame (list (cons 'speedbar-buffer
134 138 (get-buffer-create new-ecb-speedbar-buffer-name)))))))
135 139
@@ -140,17 +144,22 @@ frame. When complete return the new buffer name."
140 144
141 145 (let((new-buffer-name (format buffer-format-name
142 146 (format-time-string "%s"))))
143   -
144   - (modify-frame-parameters nil (list (cons variable new-buffer-name)))
  147 + (with-no-warnings
  148 + (set-frame-parameter nil frame (list (cons variable new-buffer-name))))
  149 +
  150 + (with-no-warnings
  151 + (modify-frame-parameters frame (list (cons variable new-buffer-name))))
  152 +
145 153 new-buffer-name))
146 154
147   -(defun ecb-multiframe-deactivate-internal ()
148   - "Deactivates the ECB and kills all ECB buffers and windows."
149   - (unless (not ecb-minor-mode)
150   -
151   - (setq ecb-minor-mode nil))
152   - (message "The ECB is now deactivated.")
153   - ecb-minor-mode)
  155 +(with-no-warnings
  156 + (defun ecb-deactivate-internal ()
  157 + "Deactivates the ECB and kills all ECB buffers and windows."
  158 + (unless (not ecb-minor-mode)
  159 +
  160 + (setq ecb-minor-mode nil))
  161 + (message "The ECB is now deactivated.")
  162 + ecb-minor-mode))
154 163
155 164 (defun ecb-multiframe-activate-hook()
156 165 "Hook to run to initialize multiframe support"
4 ecb-semantic-wrapper.el
@@ -208,11 +208,11 @@ function ECB uses from the semanticdb library.")
208 208 (apply 'semantic-tag name class ignore)
209 209 (list name class nil nil nil nil)))
210 210
211   -(defsubst ecb--semantic-tag-new-variable (name type default-value &rest attributes)
  211 +(with-no-warnings(defsubst ecb--semantic-tag-new-variable (name type default-value &rest attributes)
212 212 "Create a semantic tag of class variable"
213 213 (if (fboundp 'semantic-tag-new-variable)
214 214 (apply 'semantic-tag-new-variable name type default-value attributes)
215   - (list name 'variable nil nil nil nil)))
  215 + (list name 'variable nil nil nil nil))))
216 216
217 217 (defsubst ecb--semantic--tag-set-overlay (tag overlay)
218 218 "Set the overlay part of TAG with OVERLAY. OVERLAY can be an overlay or an
8 ecb-util.el
@@ -2357,6 +2357,14 @@ cons-cell \('test-inner-loop . \"test\")"
2357 2357 ;; labels is obsolete as of Gnu Emacs 24.3
2358 2358 (unless (fboundp 'cl-labels) (fset 'cl-labels 'labels))
2359 2359
  2360 +;; redraw-modeline is an obsolete function as of Gnu Emacs 24.3
  2361 +(defmacro ecb-redraw-modeline (&optional kind)
  2362 + (if (or (> emacs-major-version 24)
  2363 + (and (>= emacs-major-version 24)
  2364 + (>= emacs-minor-version 3)))
  2365 + `(force-mode-line-update ,kind)
  2366 + `(redraw-modeline)))
  2367 +
2360 2368 ;;; ----- Provide ------------------------------------------
2361 2369
2362 2370 (silentcomp-provide 'ecb-util)
15 ecb.el
@@ -200,6 +200,9 @@
200 200 ;; to avoid compiler grips
201 201 (require 'cl))
202 202
  203 +;; XEmacs
  204 +(silentcomp-defun ecb-redraw-modeline)
  205 +
203 206 ;;====================================================
204 207 ;; Variables
205 208 ;;====================================================
@@ -1145,8 +1148,9 @@ always the ECB-frame if called from another frame."
1145 1148 (let ((ecb-minor-mode t))
1146 1149 (ecb-deactivate-internal t))
1147 1150 (setq ecb-minor-mode nil)
1148   -
1149   - (force-mode-line-update t)
  1151 + (if ecb-running-xemacs
  1152 + (ecb-redraw-modeline t)
  1153 + (force-mode-line-update t))
1150 1154 (error "ECB %s: %s (error-type: %S, error-data: %S)" ecb-version msg
1151 1155 (car err) (cdr err)))
1152 1156
@@ -1650,8 +1654,11 @@ if the minor mode is enabled.
1650 1654 (if new-state
1651 1655 (ecb-activate-internal)
1652 1656 (ecb-deactivate-internal)))
1653   -
1654   - (force-mode-line-update t)
  1657 +
  1658 + (if ecb-running-xemacs
  1659 + (ecb-redraw-modeline t)
  1660 + (force-mode-line-update t))
  1661 +
1655 1662 ecb-minor-mode)
1656 1663
1657 1664

0 comments on commit 69a25b3

Please sign in to comment.
Something went wrong with that request. Please try again.