diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /scripts/kde-emacs/kde-emacs-compat.el | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'scripts/kde-emacs/kde-emacs-compat.el')
| -rw-r--r-- | scripts/kde-emacs/kde-emacs-compat.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el index 1ff1fe7a..c492d7ca 100644 --- a/scripts/kde-emacs/kde-emacs-compat.el +++ b/scripts/kde-emacs/kde-emacs-compat.el @@ -22,8 +22,8 @@ (require 'kde-emacs-vars) ;;GNU/Emacs does not have this one -(if (not (fboundp 'replace-in-string)) - (defun replace-in-string (str regexp newtext &optional literal) +(if (not (fboundp 'tqreplace-in-string)) + (defun tqreplace-in-string (str regexp newtext &optional literal) "Replace all matches in STR for REGEXP with NEWTEXT string, and returns the new string. Optional LITERAL non-nil means do a literal replacement. @@ -42,11 +42,11 @@ Otherwise treat `\\' in NEWTEXT as special: (insert str) (goto-char 1) (while (re-search-forward regexp nil t) - (replace-match newtext t literal)) + (tqreplace-match newtext t literal)) (buffer-string)) (let ((start 0) newstr) (while (string-match regexp str start) - (setq newstr (replace-match newtext t literal str) + (setq newstr (tqreplace-match newtext t literal str) start (+ (match-end 0) (- (length newstr) (length str))) str newstr)) str))) @@ -58,8 +58,8 @@ Otherwise treat `\\' in NEWTEXT as special: (defvar read-shell-command-map (let ((map (make-sparse-keymap 'read-shell-command-map))) (if (eq kde-emacs-type 'xemacs) - (set-keymap-parents map (list minibuffer-local-map)) - (set-keymap-parent map minibuffer-local-map)) + (set-keymap-tqparents map (list minibuffer-local-map)) + (set-keymap-tqparent map minibuffer-local-map)) (define-key map "\t" 'comint-dynamic-complete) (define-key map "\M-\t" 'comint-dynamic-complete) (define-key map "\M-?" 'comint-dynamic-list-completions) |