diff options
Diffstat (limited to 'lisp/composite.el')
| -rw-r--r-- | lisp/composite.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 7daea54c9e9..3d4805e8fa0 100644 --- a/lisp/composite.el +++ b/lisp/composite.el | |||
| @@ -119,7 +119,7 @@ RULE is a cons of global and new reference point symbols | |||
| 119 | (setq nref (cdr (assq nref reference-point-alist)))) | 119 | (setq nref (cdr (assq nref reference-point-alist)))) |
| 120 | (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) | 120 | (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) |
| 121 | (error "Invalid composition rule: %S" rule)) | 121 | (error "Invalid composition rule: %S" rule)) |
| 122 | (logior (lsh xoff 16) (lsh yoff 8) (+ (* gref 12) nref))) | 122 | (logior (ash xoff 16) (ash yoff 8) (+ (* gref 12) nref))) |
| 123 | (error "Invalid composition rule: %S" rule)))) | 123 | (error "Invalid composition rule: %S" rule)))) |
| 124 | 124 | ||
| 125 | ;; Decode encoded composition rule RULE-CODE. The value is a cons of | 125 | ;; Decode encoded composition rule RULE-CODE. The value is a cons of |
| @@ -130,8 +130,8 @@ RULE is a cons of global and new reference point symbols | |||
| 130 | (defun decode-composition-rule (rule-code) | 130 | (defun decode-composition-rule (rule-code) |
| 131 | (or (and (natnump rule-code) (< rule-code #x1000000)) | 131 | (or (and (natnump rule-code) (< rule-code #x1000000)) |
| 132 | (error "Invalid encoded composition rule: %S" rule-code)) | 132 | (error "Invalid encoded composition rule: %S" rule-code)) |
| 133 | (let ((xoff (lsh rule-code -16)) | 133 | (let ((xoff (ash rule-code -16)) |
| 134 | (yoff (logand (lsh rule-code -8) #xFF)) | 134 | (yoff (logand (ash rule-code -8) #xFF)) |
| 135 | gref nref) | 135 | gref nref) |
| 136 | (setq rule-code (logand rule-code #xFF) | 136 | (setq rule-code (logand rule-code #xFF) |
| 137 | gref (car (rassq (/ rule-code 12) reference-point-alist)) | 137 | gref (car (rassq (/ rule-code 12) reference-point-alist)) |