| 1 | diff -Bubr ProofGeneral-4.0pre101004/generic/pg-pbrpm.el pg-patched/generic/pg-pbrpm.el |
|---|
| 2 | --- ProofGeneral-4.0pre101004/generic/pg-pbrpm.el 2010-10-01 07:39:13.000000000 -0700 |
|---|
| 3 | +++ pg-patched/generic/pg-pbrpm.el 2010-10-05 21:37:57.000000000 -0700 |
|---|
| 4 | @@ -237,7 +237,7 @@ |
|---|
| 5 | (list 'pg-pbrpm-run-command |
|---|
| 6 | (list command nil nil)))))))) |
|---|
| 7 | ;; finally display the pop-up-menu |
|---|
| 8 | - (popup-menu pbrpm-menu-desc)) |
|---|
| 9 | + ) |
|---|
| 10 | (pg-pbrpm-create-reset-buffer-menu) |
|---|
| 11 | (while pbrpm-list |
|---|
| 12 | (let* ((pbrpm-list-car (pop pbrpm-list)) |
|---|
| 13 | @@ -439,7 +439,6 @@ |
|---|
| 14 | "Returns the list of informations about the click needed to call generate-menu. EVENT is an event." |
|---|
| 15 | (save-excursion |
|---|
| 16 | (save-window-excursion |
|---|
| 17 | - (mouse-set-point event) |
|---|
| 18 | (let* ((pos (event-point event)) |
|---|
| 19 | (buffer (event-buffer event)) |
|---|
| 20 | (r (pg-pbrpm-get-pos-info (pg-pbrpm-translate-position buffer pos)))) |
|---|
| 21 | diff -Bubr ProofGeneral-4.0pre101004/generic/pg-user.el pg-patched/generic/pg-user.el |
|---|
| 22 | --- ProofGeneral-4.0pre101004/generic/pg-user.el 2010-10-04 09:11:48.000000000 -0700 |
|---|
| 23 | +++ pg-patched/generic/pg-user.el 2010-10-05 21:38:56.000000000 -0700 |
|---|
| 24 | @@ -252,7 +252,6 @@ |
|---|
| 25 | "Call `proof-goto-point' on the click position EVENT." |
|---|
| 26 | (interactive "e") |
|---|
| 27 | (proof-with-script-buffer |
|---|
| 28 | - (mouse-set-point event) |
|---|
| 29 | (proof-goto-point) |
|---|
| 30 | (proof-maybe-follow-locked-end))) |
|---|
| 31 | |
|---|
| 32 | @@ -779,9 +778,7 @@ |
|---|
| 33 | (let* |
|---|
| 34 | ((idiom (and span (span-property span 'idiom))) |
|---|
| 35 | (id (and span (span-property span 'id)))) |
|---|
| 36 | - (popup-menu (pg-create-in-span-context-menu |
|---|
| 37 | - span idiom |
|---|
| 38 | - (if id (symbol-name id)))))))) |
|---|
| 39 | + )))) |
|---|
| 40 | |
|---|
| 41 | (defun pg-toggle-visibility () |
|---|
| 42 | "Toggle visibility of region under point." |
|---|
| 43 | @@ -898,7 +895,6 @@ |
|---|
| 44 | (save-selected-window |
|---|
| 45 | (save-selected-frame |
|---|
| 46 | (save-excursion |
|---|
| 47 | - (mouse-set-point event) |
|---|
| 48 | (pg-identifier-near-point-query)))))) |
|---|
| 49 | |
|---|
| 50 | ;;;###autoload |
|---|
| 51 | diff -Bubr ProofGeneral-4.0pre101004/generic/proof-splash.el pg-patched/generic/proof-splash.el |
|---|
| 52 | --- ProofGeneral-4.0pre101004/generic/proof-splash.el 2010-08-22 14:53:13.000000000 -0700 |
|---|
| 53 | +++ pg-patched/generic/proof-splash.el 2010-10-05 21:39:14.000000000 -0700 |
|---|
| 54 | @@ -150,7 +150,7 @@ |
|---|
| 55 | (glyph-pixwidth (cond ((stringp glyph) |
|---|
| 56 | (* avg-pixwidth (length glyph))) |
|---|
| 57 | ((proof-emacs-imagep glyph) |
|---|
| 58 | - (car (image-size glyph 'inpixels))) |
|---|
| 59 | + ) |
|---|
| 60 | (t |
|---|
| 61 | (error |
|---|
| 62 | "proof-splash-centre-spaces: bad arg"))))) |
|---|
| 63 | diff -Bubr ProofGeneral-4.0pre101004/generic/proof-toolbar.el pg-patched/generic/proof-toolbar.el |
|---|
| 64 | --- ProofGeneral-4.0pre101004/generic/proof-toolbar.el 2010-09-21 17:39:59.000000000 -0700 |
|---|
| 65 | +++ pg-patched/generic/proof-toolbar.el 2010-10-05 21:39:36.000000000 -0700 |
|---|
| 66 | @@ -112,7 +112,7 @@ |
|---|
| 67 | (proof-buffers-in-mode proof-mode-for-script) |
|---|
| 68 | (proof-associated-buffers)) |
|---|
| 69 | (when proof-toolbar-enable |
|---|
| 70 | - (set (make-local-variable 'tool-bar-map) proof-toolbar-map)) |
|---|
| 71 | + ) |
|---|
| 72 | (when (not proof-toolbar-enable) |
|---|
| 73 | (kill-local-variable 'tool-bar-map))))) |
|---|
| 74 | |
|---|
| 75 | diff -Bubr ProofGeneral-4.0pre101004/lib/holes.el pg-patched/lib/holes.el |
|---|
| 76 | --- ProofGeneral-4.0pre101004/lib/holes.el 2009-09-06 10:31:50.000000000 -0700 |
|---|
| 77 | +++ pg-patched/lib/holes.el 2010-10-05 21:39:53.000000000 -0700 |
|---|
| 78 | @@ -477,7 +477,7 @@ |
|---|
| 79 | (defalias 'holes-track-mouse-selection 'mouse-drag-track) |
|---|
| 80 | (defsubst holes-track-mouse-clicks () |
|---|
| 81 | "See `mouse-track-click-count'" |
|---|
| 82 | - (+ mouse-selection-click-count 1)) |
|---|
| 83 | +) |
|---|
| 84 | |
|---|
| 85 | (defun holes-mouse-replace-active-hole (event) |
|---|
| 86 | "Replace the active hole with one under mouse EVENT." |
|---|
| 87 | diff -Bubr ProofGeneral-4.0pre101004/lib/pg-fontsets.el pg-patched/lib/pg-fontsets.el |
|---|
| 88 | --- ProofGeneral-4.0pre101004/lib/pg-fontsets.el 2009-12-01 01:43:50.000000000 -0800 |
|---|
| 89 | +++ pg-patched/lib/pg-fontsets.el 2010-10-05 21:40:18.000000000 -0700 |
|---|
| 90 | @@ -29,24 +29,7 @@ |
|---|
| 91 | (defvar pg-fontsets-names nil |
|---|
| 92 | "*List of fontsets to use with Proof General.") |
|---|
| 93 | |
|---|
| 94 | -(defun pg-fontsets-make-fontsetsizes (basefont) |
|---|
| 95 | - (dolist (size '(10 12 14 18 22)) |
|---|
| 96 | - (add-to-list 'pg-fontsets-names |
|---|
| 97 | - (create-fontset-from-fontset-spec |
|---|
| 98 | - (replace-regexp-in-string |
|---|
| 99 | - "%T" (car (split-string basefont)) |
|---|
| 100 | - (replace-regexp-in-string |
|---|
| 101 | - "%S" (int-to-string size) |
|---|
| 102 | - (replace-regexp-in-string |
|---|
| 103 | - "%F" basefont |
|---|
| 104 | -"-*-%F-*-*-*--%S-*-*-*-*-*-fontset-PG%T, |
|---|
| 105 | -gnu-unifont:-*-%F-*-*-*--%S-*-*-*-*-*-iso10646-1" |
|---|
| 106 | -;ascii:-*-%F-medium-r-normal--%S-*-*-*-*-*-mac-roman, |
|---|
| 107 | -;latin-iso8859-1:-*-%F-medium-r-normal--%S-*-*-*-*-*-mac-roman, |
|---|
| 108 | -;mule-unicode-0100-24ff:-*-%F-medium-r-normal--%S--*-*-*-*-*-iso10646-1, |
|---|
| 109 | -;mule-unicode-2500-33ff:-*-%F-medium-r-normal--%S--*-*-*-*-*-iso10646-1, |
|---|
| 110 | -;mule-unicode-e000-ffff:-*-%F-medium-r-normal--%S--*-*-*-*-*-iso10646-1" |
|---|
| 111 | -))))))) |
|---|
| 112 | +(defun pg-fontsets-make-fontsetsizes (basefont)) |
|---|
| 113 | |
|---|
| 114 | (defconst pg-fontsets-base-fonts |
|---|
| 115 | '("dejavu lgc sans mono" |
|---|
| 116 | diff -Bubr ProofGeneral-4.0pre101004/lib/unicode-tokens.el pg-patched/lib/unicode-tokens.el |
|---|
| 117 | --- ProofGeneral-4.0pre101004/lib/unicode-tokens.el 2010-09-08 05:46:39.000000000 -0700 |
|---|
| 118 | +++ pg-patched/lib/unicode-tokens.el 2010-10-05 21:42:58.000000000 -0700 |
|---|
| 119 | @@ -498,7 +498,8 @@ |
|---|
| 120 | (compps (gethash (match-string match) |
|---|
| 121 | unicode-tokens-hash-table)) |
|---|
| 122 | (propsyms (cdr-safe compps)) |
|---|
| 123 | - (comp (car-safe compps))) |
|---|
| 124 | + (comp (car-safe compps)) |
|---|
| 125 | + ) |
|---|
| 126 | (if (and comp (not unicode-tokens-show-symbols)) |
|---|
| 127 | (compose-region start end |
|---|
| 128 | (unicode-tokens-interpret-composition comp))) |
|---|
| 129 | @@ -1267,14 +1268,7 @@ |
|---|
| 130 | "Select an Emacs font from a list of known good fonts and fontsets." |
|---|
| 131 | (unless (display-multi-font-p) |
|---|
| 132 | (error "Cannot change fonts on this display")) |
|---|
| 133 | - (car-safe ; just choose first |
|---|
| 134 | - ; (original cycles through trying set-default-font |
|---|
| 135 | - (x-popup-menu |
|---|
| 136 | - (if (listp last-nonmenu-event) |
|---|
| 137 | - last-nonmenu-event |
|---|
| 138 | - (list '(0 0) (selected-window))) |
|---|
| 139 | - ;; Append list of fontsets currently defined. |
|---|
| 140 | - (append x-fixed-font-alist (list (generate-fontset-menu)))))) |
|---|
| 141 | +) |
|---|
| 142 | |
|---|
| 143 | (defsubst unicode-tokens-face-font-sym (fontsym) |
|---|
| 144 | "Return the symbol unicode-tokens-FONTSYM-font-face." |
|---|
