diff lisp/x-scrollbar.el @ 286:57709be46d1b r21-0b41

Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents c42ec1d1cded
children 70ad99077275
line wrap: on
line diff
--- a/lisp/x-scrollbar.el	Mon Aug 13 10:34:15 2007 +0200
+++ b/lisp/x-scrollbar.el	Mon Aug 13 10:35:03 2007 +0200
@@ -79,20 +79,20 @@
 
   ;; Now do ScrollBarPlacement.scrollBarPlacement
   (let ((case-fold-search t)
-	(resval (x-get-resource-and-maybe-bogosity-check
-		 "ScrollBarPlacement" "scrollBarPlacement" 'string locale)))
+	(resval (x-get-resource "ScrollBarPlacement" "scrollBarPlacement"
+				'string locale)))
     (cond
      ((null resval))
-     ((string-match "^top_left$" resval)
+     ((string-match "^top[_-]left$" resval)
       (set-specifier scrollbar-on-top-p t locale)
       (set-specifier scrollbar-on-left-p t locale))
-     ((string-match "^top_right$" resval)
+     ((string-match "^top[_-]right$" resval)
       (set-specifier scrollbar-on-top-p t locale)
       (set-specifier scrollbar-on-left-p nil locale))
-     ((string-match "^bottom_left$" resval)
+     ((string-match "^bottom[_-]left$" resval)
       (set-specifier scrollbar-on-top-p nil locale)
       (set-specifier scrollbar-on-left-p t locale))
-     ((string-match "^bottom_right$" resval)
+     ((string-match "^bottom[_-]right$" resval)
       (set-specifier scrollbar-on-top-p nil locale)
       (set-specifier scrollbar-on-left-p nil locale))
      (t