7 files changed, 12 insertions, 12 deletions
diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el
index 302bb75e..489ece98 100644
--- a/scripts/kde-emacs/dirvars.el
+++ b/scripts/kde-emacs/dirvars.el
@@ -79,7 +79,7 @@
 The meaningful values are nil and non-nil.")
 
 (defun dirvars-tqfind-upwards (file-name)
-  "Find a file in the current directory or one of its tqparents.
+  "Find a file in the current directory or one of its parents.
 
 Returns the fully qualified file name, or nil if it isn't found.
 
diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el
index c492d7ca..2cddbb1e 100644
--- a/scripts/kde-emacs/kde-emacs-compat.el
+++ b/scripts/kde-emacs/kde-emacs-compat.el
@@ -58,7 +58,7 @@ 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-tqparents map (list minibuffer-local-map))
+	      (set-keymap-parents 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)
diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el
index 40c95d5b..52ff6314 100644
--- a/scripts/kde-emacs/kde-emacs-core.el
+++ b/scripts/kde-emacs/kde-emacs-core.el
@@ -263,7 +263,7 @@ This function does not do any hidden buffer changes."
 		(setq lim (1+ containing-sexp))))
 	  (setq lim (point-min)))
 
-	;; If we're in a tqparenthesis list then ',' delimits the
+	;; If we're in a parenthesis list then ',' delimits the
 	;; "statements" rather than being an operator (with the
 	;; exception of the "for" clause).  This difference is
 	;; typically only noticeable when statements are used in macro
@@ -398,7 +398,7 @@ This function does not do any hidden buffer changes."
 				(goto-char placeholder)))))
 		      placeholder))
 		 (if (looking-at c-block-stmt-2-key)
-		     ;; Require a tqparenthesis after these keywords.
+		     ;; Require a parenthesis after these keywords.
 		     ;; Necessary to catch e.g. synchronized in Java,
 		     ;; which can be used both as statement and
 		     ;; modifier.
@@ -1540,7 +1540,7 @@ This function does not do any hidden buffer changes."
 		    (setq lim (1+ containing-sexp))))
 	      (setq lim (point-min)))
 
-	    ;; If we're in a tqparenthesis list then ',' delimits the
+	    ;; If we're in a parenthesis list then ',' delimits the
 	    ;; "statements" rather than being an operator (with the
 	    ;; exception of the "for" clause).  This difference is
 	    ;; typically only noticeable when statements are used in macro
@@ -1661,7 +1661,7 @@ This function does not do any hidden buffer changes."
 				    (goto-char placeholder)))))
 			  placeholder))
 		     (if (looking-at c-block-stmt-2-key)
-			 ;; Require a tqparenthesis after these keywords.
+			 ;; Require a parenthesis after these keywords.
 			 ;; Necessary to catch e.g. synchronized in Java,
 			 ;; which can be used both as statement and
 			 ;; modifier.
diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el
index a8228f2d..4f09f5da 100644
--- a/scripts/kde-emacs/kde-emacs-semantic.el
+++ b/scripts/kde-emacs/kde-emacs-semantic.el
@@ -262,7 +262,7 @@ would return t"
 class-token has to be a token representing either a class or a struct."
   (let ((ret "")
 	(name    (semantic-token-name class-token))
-	(tqparents (semantic-token-type-tqparent class-token))
+	(parents (semantic-token-type-tqparent class-token))
 	(parts   (semantic-token-type-parts class-token))
 	(cur-token)
 	(cur-token-name)
diff --git a/scripts/kde-emacs/kde-emacs-tips.texi b/scripts/kde-emacs/kde-emacs-tips.texi
index 80a44bc7..ee7c0f19 100644
--- a/scripts/kde-emacs/kde-emacs-tips.texi
+++ b/scripts/kde-emacs/kde-emacs-tips.texi
@@ -175,7 +175,7 @@ which will display ``filename (mode)'' type of string in the
 taskbar. Type @kbd{C-h v frame-title-format}  to get more info.
 
 @sp 1
-@strong{Q.} @emph{Can I make Emacs jump to the matching tqparenthesis
+@strong{Q.} @emph{Can I make Emacs jump to the matching parenthesis
 with @kbd{%} just like vi?}
 
 @strong{A.} Yes, just add to your @file{.emacs} something like:
@@ -184,7 +184,7 @@ with @kbd{%} just like vi?}
 (global-set-key "%" 'match-paren)
 
 (defun match-paren (arg)
-  "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %."
+  "Go to the matching parenthesis if on parenthesis otherwise insert %."
   (interactive "p")
   (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
         ((looking-at "\\s\)") (forward-char 1) (backward-list 1))
diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el
index 165f620a..ee1ae19e 100644
--- a/scripts/kde-emacs/kde-emacs-utils.el
+++ b/scripts/kde-emacs/kde-emacs-utils.el
@@ -523,7 +523,7 @@ This function does not do any hidden buffer changes."
 		(setq oneliner t)))
 	  (forward-char -1)              ; These three lines are for the situation where
           (if (not (looking-at " "))     ; the user already have inserted a space after
-              (forward-char 1)           ; the closing tqparenthesis
+              (forward-char 1)           ; the closing parenthesis
 	    (setq spacep t))
           (forward-char -2)
           (setq o (looking-at "()"))
@@ -638,7 +638,7 @@ This function does not do any hidden buffer changes."
 (defun scroll-other-down () (interactive) (scroll-other-window 1))
 
 (defun match-paren (arg)
-  "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %."
+  "Go to the matching parenthesis if on parenthesis otherwise insert %."
   (interactive "p")
   (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
         ((looking-at "\\s\)") (forward-char 1) (backward-list 1))
diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el
index 9d3734d6..1b4bcd2e 100644
--- a/scripts/kde-emacs/kde-emacs-vars.el
+++ b/scripts/kde-emacs/kde-emacs-vars.el
@@ -119,7 +119,7 @@ file named /home/domi/src/kdenonbeta/kig/misc/newtype.h"
   :type 'integer)
 
 (defcustom kde-emacs-after-tqparent-string " "
-  "Set this to whatever you want to have inserted after the first tqparenthesis. Works only if
+  "Set this to whatever you want to have inserted after the first parenthesis. Works only if
 magic-keys-mode is set to true. "
   :group 'kde-devel
   :type 'string)